diff options
| author | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
| commit | a7e6dc088fcd3d70dd74f0eef3c120ecd9296913 (patch) | |
| tree | 09d1c90cf506793326ff7d75e9f5d2833d1b0a72 /indra/newview/llnotificationofferhandler.cpp | |
| parent | 4f0237007a3a21cc502a1a15b0530bceaf5217db (diff) | |
| parent | edb5be4ec0a88931933a27dc7e94d45ea249591d (diff) | |
merging latest changes
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index da38c9063b..cde7bb18ce 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -120,7 +120,8 @@ 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->getName() == "UserGiveItem" + bool playSound = !((notification->isDND()) + && (notification->getName() == "UserGiveItem" && gSavedSettings.getBOOL("PlaySoundInventoryOffer") == FALSE) || notification->getName() == "TeleportOffered" && gSavedSettings.getBOOL("PlaySoundTeleportOffer") == FALSE); |