Don't need this here...

Tue, 06 Jan 2015 15:22:32 +0100

author
Ansariel
date
Tue, 06 Jan 2015 15:22:32 +0100
changeset 43101
c237bb7b935c
parent 43100
09d07fa095d5
child 43102
2012c454de90

Don't need this here...

indra/newview/llviewermessage.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llviewermessage.cpp	Tue Jan 06 10:04:52 2015 +0100
     1.2 +++ b/indra/newview/llviewermessage.cpp	Tue Jan 06 15:22:32 2015 +0100
     1.3 @@ -1213,7 +1213,7 @@
     1.4  		static LLCachedControl<U32> fsOfferThrottleMaxCount(gSavedSettings, "FSOfferThrottleMaxCount");
     1.5  		if (LLStartUp::getStartupState() >= STATE_STARTED
     1.6  			//&& throttle_count >= OFFER_THROTTLE_MAX_COUNT)
     1.7 -			&& throttle_count >= U32(fsOfferThrottleMaxCount))
     1.8 +			&& throttle_count >= fsOfferThrottleMaxCount)
     1.9  		{
    1.10  			if (!throttle_logged)
    1.11  			{
    1.12 @@ -1232,7 +1232,6 @@
    1.13  				if (!from_name.empty())
    1.14  				{
    1.15  					// <FS:PP> gSavedSettings to LLCachedControl
    1.16 -					// if (gSavedSettings.getBOOL("FSNotifyIncomingObjectSpamFrom"))
    1.17  					static LLCachedControl<bool> fsNotifyIncomingObjectSpamFrom(gSavedSettings, "FSNotifyIncomingObjectSpamFrom");
    1.18  					if (fsNotifyIncomingObjectSpamFrom)
    1.19  					// </FS:PP>
    1.20 @@ -1244,7 +1243,6 @@
    1.21  				else
    1.22  				{
    1.23  					// <FS:PP> gSavedSettings to LLCachedControl
    1.24 -					// if (gSavedSettings.getBOOL("FSNotifyIncomingObjectSpam"))
    1.25  					static LLCachedControl<bool> fsNotifyIncomingObjectSpam(gSavedSettings, "FSNotifyIncomingObjectSpam");
    1.26  					if (fsNotifyIncomingObjectSpam)
    1.27  					// </FS:PP>

mercurial