1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index ccad49bc30..8672dc479d 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -493,6 +493,21 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
 	}
 	// adjust panel's height to the text size
 	snapToMessageHeight(mTextBox, MAX_LENGTH);
+
+    bool playSound = true;
+
+    if((mNotification->getName() == "UserGiveItem"
+            && gSavedSettings.getBOOL("PlaySoundInventoryOffer") == FALSE)
+        ||  mNotification->getName() == "TeleportOffered"
+            && gSavedSettings.getBOOL("PlaySoundTeleportOffer") == FALSE)
+    {
+        playSound = false;
+    }
+
+    if(playSound)
+    {
+        mNotification->playSound();
+    }
 }