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

diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index ed15d9d922..93d62fd7c2 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -35,12 +35,21 @@
 #include "lldockablefloater.h"
 
 //static
-LLHandle<LLFloater> LLDockableFloater::instanceHandle;
+LLHandle<LLFloater> LLDockableFloater::sInstanceHandle;
 
 LLDockableFloater::LLDockableFloater(LLDockControl* dockControl,
 		const LLSD& key, const Params& params) :
-	LLFloater(key, params), mDockControl(dockControl)
+	LLFloater(key, params), mDockControl(dockControl), mUniqueDocking(true)
 {
+	setDocked(mDockControl.get() != NULL && mDockControl.get()->isDockVisible());
+	resetInstance();
+}
+
+LLDockableFloater::LLDockableFloater(LLDockControl* dockControl, bool uniqueDocking,
+		const LLSD& key, const Params& params) :
+	LLFloater(key, params), mDockControl(dockControl), mUniqueDocking(uniqueDocking)
+{
+	setDocked(mDockControl.get() != NULL && mDockControl.get()->isDockVisible());
 	resetInstance();
 }
 
@@ -57,22 +66,14 @@ BOOL LLDockableFloater::postBuild()
 
 void LLDockableFloater::resetInstance()
 {
-	if (instanceHandle.get() != this)
+	if (mUniqueDocking && sInstanceHandle.get() != this)
 	{
-		if (instanceHandle.get() != NULL && instanceHandle.get()->isDocked())
+		if (sInstanceHandle.get() != NULL && sInstanceHandle.get()->isDocked())
 		{
-			//closeFloater() is not virtual
-			if (instanceHandle.get()->canClose())
-			{
-				instanceHandle.get()->closeFloater();
+			sInstanceHandle.get()->setVisible(FALSE);
 			}
-			else
-			{
-				instanceHandle.get()->setVisible(FALSE);
+		sInstanceHandle = getHandle();
 			}
-		}
-		instanceHandle = getHandle();
-	}
 }
 
 void LLDockableFloater::setVisible(BOOL visible)
@@ -81,12 +82,18 @@ void LLDockableFloater::setVisible(BOOL visible)
 	{
 		resetInstance();
 	}
+
+	if (visible && mDockControl.get() != NULL)
+	{
+		mDockControl.get()->repositionDockable();
+	}
+
 	LLFloater::setVisible(visible);
 }
 
 void LLDockableFloater::setDocked(bool docked, bool pop_on_undock)
 {
-	if (mDockControl.get() != NULL)
+	if (mDockControl.get() != NULL && mDockControl.get()->isDockVisible())
 	{
 		if (docked)
 		{
@@ -97,13 +104,17 @@ void LLDockableFloater::setDocked(bool docked, bool pop_on_undock)
 		{
 			mDockControl.get()->off();
 		}
-	}
 
 	if (!docked && pop_on_undock)
 	{
 		// visually pop up a little bit to emphasize the undocking
 		translate(0, UNDOCK_LEAP_HEIGHT);
 	}
+	}
+	else
+	{
+		docked = false;
+	}
 
 	LLFloater::setDocked(docked, pop_on_undock);
 }
@@ -113,15 +124,20 @@ void LLDockableFloater::draw()
 	if (mDockControl.get() != NULL)
 	{
 		mDockControl.get()->repositionDockable();
+		if (isDocked())
+		{
 		mDockControl.get()->drawToungue();
 	}
+	}
 	LLFloater::draw();
 }
 
 void LLDockableFloater::setDockControl(LLDockControl* dockControl)
 {
 	mDockControl.reset(dockControl);
+	setDocked(mDockControl.get() != NULL && mDockControl.get()->isDockVisible());
 }
+
 const LLUIImagePtr& LLDockableFloater::getDockTongue()
 {
 	return mDockTongue;