diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-15 19:24:45 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-15 19:24:45 -0800 |
| commit | 987350fcb3cf2da03b70ac3fbadb0429f523d07a (patch) | |
| tree | 3fa718455b83ea0204fbb45109bb5cddc92ad9ad /indra/newview | |
| parent | 89f7335a52ec9955432dbe8bfa5903f605b7362c (diff) | |
CHUI-489: Code review cleanup for both CHUI-489 and CHUI-486. This should be last commit for CHUI-489.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 8b7cac9f4b..91003c7d53 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -118,22 +118,16 @@ bool LLOfferHandler::processNotification(const LLNotificationPtr& notification) if(channel) channel->addToast(p); - bool playSound = true; - - //Play notification sound for inventory offer and teleport offer based upon chat preference - if((notification->getName() == "UserGiveItem" - && gSavedSettings.getBOOL("PlaySoundInventoryOffer") == FALSE) - || notification->getName() == "TeleportOffered" - && gSavedSettings.getBOOL("PlaySoundTeleportOffer") == FALSE) - { - playSound = false; - } + //Will not play a notification sound for inventory and teleport offer based upon chat preference + bool playSound = !((notification->getName() == "UserGiveItem" + && gSavedSettings.getBOOL("PlaySoundInventoryOffer") == FALSE) + || notification->getName() == "TeleportOffered" + && gSavedSettings.getBOOL("PlaySoundTeleportOffer") == FALSE); if(playSound) { notification->playSound(); } - } if (notification->canLogToIM()) |