merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3

JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed

1 files changed, 34 insertions, 35 deletions

diff --git a/indra/newview/llimhandler.cpp b/indra/newview/llimhandler.cpp
index a47477c446..46067c081f 100644
--- a/indra/newview/llimhandler.cpp
+++ b/indra/newview/llimhandler.cpp
@@ -36,29 +36,18 @@
 #include "llnotificationhandler.h"
 
 #include "llagentdata.h"
-#include "llbottomtray.h"
-#include "llviewercontrol.h"
 #include "lltoastimpanel.h"
+#include "llviewerwindow.h"
 
 using namespace LLNotificationsUI;
 
 //--------------------------------------------------------------------------
-LLIMHandler::LLIMHandler()
+LLIMHandler::LLIMHandler(e_notification_type type, const LLSD& id)
 {
-	
-	// getting a Chiclet and creating params for a channel
-	LLBottomTray* tray = LLBottomTray::getInstance();
-	mChiclet = tray->getSysWell();
-
-	LLChannelManager::Params p;
-	// *TODO: createNotificationChannel method
-	p.id = LLUUID(gSavedSettings.getString("NotificationChannelUUID"));
-	p.channel_right_bound = tray->getRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
-	p.channel_width = gSavedSettings.getS32("NotifyBoxWidth");
+	mType = type;
 
 	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->createChannel(p);
-
+	mChannel = LLChannelManager::getInstance()->createNotificationChannel();
 }
 
 //--------------------------------------------------------------------------
@@ -67,12 +56,31 @@ LLIMHandler::~LLIMHandler()
 }
 
 //--------------------------------------------------------------------------
-void LLIMHandler::processNotification(const LLSD& notify)
+void LLIMHandler::initChannel()
+{
+	S32 channel_right_bound = gViewerWindow->getWorldViewRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); 
+	S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth");
+	mChannel->init(channel_right_bound - channel_width, channel_right_bound);
+}
+
+//--------------------------------------------------------------------------
+bool LLIMHandler::processNotification(const LLSD& notify)
 {
+	if(!mChannel)
+	{
+		return false;
+	}
+
 	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
 
 	if(!notification)
-		return;
+		return false;
+
+	// arrange a channel on a screen
+	if(!mChannel->getVisible())
+	{
+		initChannel();
+	}
 
 	if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
 	{
@@ -95,40 +103,31 @@ void LLIMHandler::processNotification(const LLSD& notify)
 		LLToastIMPanel* im_box = new LLToastIMPanel(im_p);
 
 		LLToast::Params p;
-		p.id = notification->getID();
+		p.notif_id = notification->getID();
+		p.session_id = im_p.session_id;
 		p.notification = notification;
 		p.panel = im_box;
 		p.can_be_stored = false;
-		p.on_toast_destroy = boost::bind(&LLIMHandler::onToastDestroy, this, _1);
+		p.on_delete_toast = boost::bind(&LLIMHandler::onDeleteToast, this, _1);
 		mChannel->addToast(p);
 
-
-		static_cast<LLNotificationChiclet*>(mChiclet)->updateUreadIMNotifications();
+		// send a signal to the counter manager;
+		mNewNotificationSignal();
 	}
 	else if (notify["sigtype"].asString() == "delete")
 	{
 		mChannel->killToastByNotificationID(notification->getID());
 	}
+	return true;
 }
 
 //--------------------------------------------------------------------------
-void LLIMHandler::onToastDestroy(LLToast* toast)
-{
-	toast->closeFloater();
-	static_cast<LLNotificationChiclet*>(mChiclet)->updateUreadIMNotifications();
-}
-
-//--------------------------------------------------------------------------
-void LLIMHandler::onChicletClick(void)
+void LLIMHandler::onDeleteToast(LLToast* toast)
 {
+	// send a signal to the counter manager
+	mDelNotificationSignal();
 }
 
 //--------------------------------------------------------------------------
-void LLIMHandler::onChicletClose(void)
-{
-}
-
-//--------------------------------------------------------------------------
-