summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-02-15 13:15:14 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-02-15 13:15:14 +0200
commitc0433f1460b5cd96c093e3955ecf4ddcb6376f92 (patch)
tree51117544bbfd69a0faf8e315495609a85c3065da /indra
parent4aa22db0379ba66017fe551c5466e4c1c6a888cb (diff)
CHUI-774 Fixed condition of the checking. Also the sound for Teleport offer will be played correctly now.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llnotificationofferhandler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp
index cde7bb18ce..a2bd96f35a 100644
--- a/indra/newview/llnotificationofferhandler.cpp
+++ b/indra/newview/llnotificationofferhandler.cpp
@@ -120,11 +120,11 @@ bool LLOfferHandler::processNotification(const LLNotificationPtr& notification)
channel->addToast(p);
//Will not play a notification sound for inventory and teleport offer based upon chat preference
- bool playSound = !((notification->isDND())
- && (notification->getName() == "UserGiveItem"
- && gSavedSettings.getBOOL("PlaySoundInventoryOffer") == FALSE)
- || notification->getName() == "TeleportOffered"
- && gSavedSettings.getBOOL("PlaySoundTeleportOffer") == FALSE);
+ bool playSound = (!notification->isDND()
+ && ((notification->getName() == "UserGiveItem"
+ && gSavedSettings.getBOOL("PlaySoundInventoryOffer"))
+ || (notification->getName() == "TeleportOffered"
+ && gSavedSettings.getBOOL("PlaySoundTeleportOffer"))));
if(playSound)
{