1 files changed, 29 insertions, 9 deletions

diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 088884178b..5c4f6e8860 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -39,6 +39,7 @@
 #include "llfloaterreg.h"
 #include "llnotifications.h"
 #include "llscreenchannel.h"
+#include "llsyswellwindow.h"
 #include "lltoastnotifypanel.h"
 #include "llviewerwindow.h"
 #include "llimfloater.h"
@@ -207,11 +208,22 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
 		return;
 	}
 
+	// Need to indicate of "new message" for object chiclets according to requirements
+	// specified in the Message Bar design specification. See EXT-3142.
+	bool set_new_message = false;
+
 	// If an Object spawns more-than-one floater, only the newest one is shown. 
 	// The previous is automatically closed.
 	script_notification_map_t::iterator it = mNotifications.find(object_id);
 	if(it != mNotifications.end())
 	{
+		LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", it->second.notification_id);
+		if(floater)
+		{
+			// Generate chiclet with a "new message" indicator if a docked window was opened. See EXT-3142.
+			set_new_message = floater->isShown();
+		}
+
 		onRemoveNotification(it->second.notification_id);
 	}
 
@@ -229,7 +241,15 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
 		LLBottomTray::getInstance()->getChicletPanel()->createChiclet<LLScriptChiclet>(object_id);
 	}
 
-	toggleScriptFloater(object_id);
+	LLIMWellWindow::getInstance()->addObjectRow(object_id, set_new_message);
+
+	LLSD data;
+	data["object_id"] = object_id;
+	data["new_message"] = set_new_message;
+	data["unread"] = 1; // each object has got only one floater
+	mNewObjectSignal(data);
+
+	toggleScriptFloater(object_id, set_new_message);
 }
 
 void LLScriptFloaterManager::onRemoveNotification(const LLUUID& notification_id)
@@ -256,6 +276,8 @@ void LLScriptFloaterManager::onRemoveNotification(const LLUUID& notification_id)
 	// remove related chiclet
 	LLBottomTray::getInstance()->getChicletPanel()->removeChiclet(object_id);
 
+	LLIMWellWindow::getInstance()->removeObjectRow(object_id);
+
 	// close floater
 	LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", notification_id);
 	if(floater)
@@ -278,15 +300,8 @@ void LLScriptFloaterManager::removeNotificationByObjectId(const LLUUID& object_i
 	}
 }
 
-void LLScriptFloaterManager::toggleScriptFloater(const LLUUID& object_id)
+void LLScriptFloaterManager::toggleScriptFloater(const LLUUID& object_id, bool set_new_message)
 {
-	// hide "new message" icon from chiclet
-	LLIMChiclet* chiclet = LLBottomTray::getInstance()->getChicletPanel()->findChiclet<LLIMChiclet>(object_id);
-	if(chiclet)
-	{
-		chiclet->setShowNewMessagesIcon(false);
-	}
-
 	// kill toast
 	using namespace LLNotificationsUI;
 	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(LLChannelManager::getInstance()->findChannelByID(
@@ -296,6 +311,11 @@ void LLScriptFloaterManager::toggleScriptFloater(const LLUUID& object_id)
 		channel->killToastByNotificationID(findNotificationToastId(object_id));
 	}
 
+	LLSD data;
+	data["object_id"] = object_id;
+	data["new_message"] = set_new_message;
+	mToggleFloaterSignal(data);
+
 	// toggle floater
 	LLScriptFloater::toggle(object_id);
 }