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, 30 insertions, 23 deletions

diff --git a/indra/newview/llnotificationalerthandler.cpp b/indra/newview/llnotificationalerthandler.cpp
index bd6c6b2308..3893eaa0d4 100644
--- a/indra/newview/llnotificationalerthandler.cpp
+++ b/indra/newview/llnotificationalerthandler.cpp
@@ -35,8 +35,8 @@
 
 #include "llnotificationhandler.h"
 #include "lltoastnotifypanel.h"
-#include "llbottomtray.h"
 #include "llviewercontrol.h"
+#include "llviewerwindow.h"
 
 #include "lltoastalertpanel.h"
 
@@ -47,17 +47,14 @@ LLAlertHandler::LLAlertHandler(e_notification_type type, const LLSD& id) : mIsMo
 {
 	mType = type;
 
-	LLBottomTray* tray = LLBottomTray::getInstance();
 	LLChannelManager::Params p;
 	p.id = LLUUID(gSavedSettings.getString("AlertChannelUUID"));
-	p.channel_right_bound = tray->getRect().getWidth() / 2;
-	p.channel_width = 0;
 	p.display_toasts_always = true;
-	p.align = NA_CENTRE;
+	p.toast_align = NA_CENTRE;
+	p.channel_align = CA_CENTRE;
 
 	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->createChannel(p);
-	mChannel->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP); 
+	mChannel = LLChannelManager::getInstance()->getChannel(p);
 	mChannel->setShowToasts(true);
 }
 
@@ -67,21 +64,42 @@ LLAlertHandler::~LLAlertHandler()
 }
 
 //--------------------------------------------------------------------------
-void LLAlertHandler::processNotification(const LLSD& notify)
+void LLAlertHandler::initChannel()
 {
+	S32 channel_right_bound = gViewerWindow->getWorldViewRect().getWidth() / 2;
+	mChannel->init(channel_right_bound, channel_right_bound);
+}
+
+//--------------------------------------------------------------------------
+bool LLAlertHandler::processNotification(const LLSD& notify)
+{
+	if(!mChannel)
+	{
+		return false;
+	}
+
 	LLNotificationPtr notification = LLNotifications::instance().find(notify["id"].asUUID());
 
+	if(!notification)
+		return false;
+
+	// arrange a channel on a screen
+	if(!mChannel->getVisible())
+	{
+		initChannel();
+	}
+
 	if (notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "load")
 	{
 		LLToastAlertPanel* alert_dialog = new LLToastAlertPanel(notification, mIsModal);
 		LLToast::Params p;
-		p.id = notification->getID();
+		p.notif_id = notification->getID();
 		p.notification = notification;
 		p.panel = dynamic_cast<LLToastPanel*>(alert_dialog);
 		p.enable_hide_btn = false;
 		p.can_fade = false;
 		p.is_modal = mIsModal;
-		p.on_toast_destroy = boost::bind(&LLAlertHandler::onToastDestroy, this, _1);
+		p.on_delete_toast = boost::bind(&LLAlertHandler::onDeleteToast, this, _1);
 		mChannel->addToast(p);
 	}
 	else if (notify["sigtype"].asString() == "change")
@@ -93,25 +111,14 @@ void LLAlertHandler::processNotification(const LLSD& notify)
 	{
 		mChannel->killToastByNotificationID(notification->getID());
 	}
+	return true;
 }
 
 //--------------------------------------------------------------------------
 
-void LLAlertHandler::onToastDestroy(LLToast* toast)
-{
-	toast->closeFloater();
-}
-
-//--------------------------------------------------------------------------
-void LLAlertHandler::onChicletClick(void)
-{
-}
-
-//--------------------------------------------------------------------------
-void LLAlertHandler::onChicletClose(void)
+void LLAlertHandler::onDeleteToast(LLToast* toast)
 {
 }
 
 //--------------------------------------------------------------------------
 
-