merging latest changes

1 files changed, 0 insertions, 14 deletions

diff --git a/indra/newview/lldonotdisturbnotificationstorage.cpp b/indra/newview/lldonotdisturbnotificationstorage.cpp
index 764da25b08..5cc0ab2081 100644
--- a/indra/newview/lldonotdisturbnotificationstorage.cpp
+++ b/indra/newview/lldonotdisturbnotificationstorage.cpp
@@ -41,8 +41,6 @@
 #include "llsingleton.h"
 #include "lluuid.h"
 
-extern void useMostItrusiveIMNotification();
-
 LLDoNotDisturbNotificationStorage::LLDoNotDisturbNotificationStorage()
 	: LLSingleton<LLDoNotDisturbNotificationStorage>()
 	, LLNotificationStorage(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "dnd_notifications.xml"))
@@ -105,21 +103,14 @@ void LLDoNotDisturbNotificationStorage::loadNotifications()
 	}
 	
 	LLNotifications& instance = LLNotifications::instance();
-    bool imToastExists = false;
 	
 	for (LLSD::array_const_iterator notification_it = data.beginArray();
 		 notification_it != data.endArray();
 		 ++notification_it)
 	{
 		LLSD notification_params = *notification_it;
-        const std::string notificationName = notification_params["name"].asString();
         const LLUUID& notificationID = notification_params["id"];
         LLNotificationPtr notification = instance.find(notificationID);
-		
-        if(notificationName == "IMToast")
-        {
-            imToastExists = true;
-        }
 
         //Notification already exists in notification pipeline (same instance of app running)
 		if (notification)
@@ -147,11 +138,6 @@ void LLDoNotDisturbNotificationStorage::loadNotifications()
 		}
 	}
 
-    if(imToastExists)
-    {
-        useMostItrusiveIMNotification();
-    }
-
 	// Clear the communication channel history and rewrite the save file to empty it as well
 	LLNotificationChannelPtr channelPtr = getCommunicationChannel();
 	LLCommunicationChannel *commChannel = dynamic_cast<LLCommunicationChannel*>(channelPtr.get());