1 files changed, 33 insertions, 13 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 781b0cb2ea..3b217ef482 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -139,20 +139,40 @@ void toast_callback(const LLSD& msg){
 		return;
 	}
 
-	// *NOTE Skip toasting if the user disable it in preferences/debug settings ~Alexandrea
-	LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(
-				msg["session_id"]);
-	if (!gSavedSettings.getBOOL("EnableGroupChatPopups")
-			&& session->isGroupSessionType())
-	{
-		return;
-	}
-	if (!gSavedSettings.getBOOL("EnableIMChatPopups")
-			&& !session->isGroupSessionType())
-	{
-		return;
-	}
+    // *NOTE Skip toasting if the user disable it in preferences/debug settings ~Alexandrea
+    LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(
+        msg["session_id"]);
+
+
+    //Ignore P2P Friend/Non-Friend toasts
+    if(session->isP2PSessionType())
+    {
+        //Ignores non-friends
+        if(LLAvatarTracker::instance().getBuddyInfo(msg["from_id"]) == NULL &&
+            gSavedSettings.getString("NotificationNonFriendIMOptions") != "toast")
+        {
+            return;
+        }
+        //Ignores friends
+        else if(gSavedSettings.getString("NotificationFriendIMOptions") != "toast")
+        {
+            return;
+        }
+    }
+    //Ignore Ad Hoc Toasts
+    else if(session->isAdHocSessionType() &&
+        gSavedSettings.getString("NotificationConferenceIMOptions") != "toast")
+    {
+        return;
+    }
+    //Ignore Group Toasts
+    else if(session->isGroupSessionType() &&
+        gSavedSettings.getString("NotificationGroupChatOptions") != "toast")
+    {
+        return;
+    }
 
+    //Show toast
 	LLAvatarNameCache::get(msg["from_id"].asUUID(),
 		boost::bind(&on_avatar_name_cache_toast,
 			_1, _2, msg));