summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llnotificationofferhandler.cpp16
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())