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, 20 insertions, 32 deletions

diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index a1912655a3..7eb5d91e53 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -49,23 +49,25 @@ namespace LLNotificationsUI{
 LLNearbyChatHandler::LLNearbyChatHandler(e_notification_type type, const LLSD& id)
 {
 	mType = type;
-	LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
-	/////////////////////////////////////////////////////
-	LLChannelManager::Params p;														  //TODO: check and correct
+	LLChannelManager::Params p;
 	p.id = LLUUID(gSavedSettings.getString("NearByChatChannelUUID"));
-	p.channel_right_bound = nearby_chat->getRect().mRight;
-	p.channel_width = nearby_chat->getRect().mRight - 16;   //HACK: 16 - ?
-	/////////////////////////////////////////////////////
-
 
 	// Getting a Channel for our notifications
-	mChannel = LLChannelManager::getInstance()->createChannel(p);
-	mChannel->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_TOP); 
+	mChannel = LLChannelManager::getInstance()->getChannel(p);
 	mChannel->setOverflowFormatString("You have %d unread nearby chat messages");
 }
 LLNearbyChatHandler::~LLNearbyChatHandler()
 {
 }
+
+void LLNearbyChatHandler::initChannel()
+{
+	LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
+	S32 channel_right_bound = nearby_chat->getRect().mRight;
+	S32 channel_width = nearby_chat->getRect().mRight - 16;   //HACK: 16 - ?
+	mChannel->init(channel_right_bound - channel_width, channel_right_bound);
+}
+
 void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 {
 	if(chat_msg.mMuted == TRUE)
@@ -80,6 +82,12 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 	nearby_chat->addMessage(chat_msg);
 	if(nearby_chat->getVisible())
 		return;//no need in toast if chat is visible
+
+	// arrange a channel on a screen
+	if(!mChannel->getVisible())
+	{
+		initChannel();
+	}
 	
 	LLUUID id;
 	id.generate();
@@ -95,34 +103,14 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg)
 	item->setVisible(true);
 
 	LLToast::Params p;
-	p.id = id;
+	p.notif_id = id;
 	p.panel = item;
-	p.on_toast_destroy = boost::bind(&LLNearbyChatHandler::onToastDestroy, this, _1);
-	p.on_mouse_enter = boost::bind(&LLNearbyChatHandler::removeNearbyToastsAndShowChat, this);
+	p.on_delete_toast = boost::bind(&LLNearbyChatHandler::onDeleteToast, this, _1);
 	mChannel->addToast(p);	
 }
 
-void LLNearbyChatHandler::onToastDestroy(LLToast* toast)
+void LLNearbyChatHandler::onDeleteToast(LLToast* toast)
 {
-	if(toast)
-		toast->closeFloater();
-}
-
-void LLNearbyChatHandler::onChicletClick(void)
-{
-}
-void LLNearbyChatHandler::onChicletClose(void)
-{
-}
-
-void LLNearbyChatHandler::removeNearbyToastsAndShowChat()
-{
-	/*
-	if(mChannel)
-		mChannel->removeToastsFromChannel();
-	
-	LLFloaterReg::showTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
-	*/
 }
 
 }