diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-29 17:50:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-29 17:50:17 -0800 |
| commit | 3f4a5625082ecbd7273983e91eeb6f469c327393 (patch) | |
| tree | bf944a0283ec8438b941c2e2773b7656f952996e /indra/newview/llnotificationofferhandler.cpp | |
| parent | df84e3c1876c5d2b321f0a8596e7e2a936073156 (diff) | |
| parent | edb5be4ec0a88931933a27dc7e94d45ea249591d (diff) | |
Pull merge from lindenlab/viewer-chui
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); |