diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6f930740a3..63c212980d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1213,7 +1213,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only) static LLCachedControl fsOfferThrottleMaxCount(gSavedSettings, "FSOfferThrottleMaxCount"); if (LLStartUp::getStartupState() >= STATE_STARTED //&& throttle_count >= OFFER_THROTTLE_MAX_COUNT) - && throttle_count >= U32(fsOfferThrottleMaxCount)) + && throttle_count >= fsOfferThrottleMaxCount) { if (!throttle_logged) { @@ -1232,7 +1232,6 @@ bool check_offer_throttle(const std::string& from_name, bool check_only) if (!from_name.empty()) { // gSavedSettings to LLCachedControl - // if (gSavedSettings.getBOOL("FSNotifyIncomingObjectSpamFrom")) static LLCachedControl fsNotifyIncomingObjectSpamFrom(gSavedSettings, "FSNotifyIncomingObjectSpamFrom"); if (fsNotifyIncomingObjectSpamFrom) // @@ -1244,7 +1243,6 @@ bool check_offer_throttle(const std::string& from_name, bool check_only) else { // gSavedSettings to LLCachedControl - // if (gSavedSettings.getBOOL("FSNotifyIncomingObjectSpam")) static LLCachedControl fsNotifyIncomingObjectSpam(gSavedSettings, "FSNotifyIncomingObjectSpam"); if (fsNotifyIncomingObjectSpam) //