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, 13 insertions, 26 deletions

diff --git a/indra/newview/llchannelmanager.h b/indra/newview/llchannelmanager.h
index e26c96b62e..811fa06d2b 100644
--- a/indra/newview/llchannelmanager.h
+++ b/indra/newview/llchannelmanager.h
@@ -34,7 +34,6 @@
 #define LL_LLCHANNELMANAGER_H
 
 
-#include "llchiclet.h"
 #include "llscreenchannel.h"
 
 #include "lluuid.h"
@@ -48,36 +47,30 @@ namespace LLNotificationsUI
  * Manager for screen channels.
  * Responsible for instantiating and retrieving screen channels.
  */
-class LLChannelManager : public LLUICtrl, public LLSingleton<LLChannelManager>
+class LLChannelManager : public LLSingleton<LLChannelManager>
 {
 public:	
-	struct Params  : public LLInitParam::Block<Params, LLUICtrl::Params>
+	struct Params
 	{
 		LLUUID			id;
-		LLChiclet*		chiclet;
-		S32				channel_right_bound;
-		S32				channel_width;
 		bool			display_toasts_always;
-		EToastAlignment	align;
+		EToastAlignment		toast_align;
+		EChannelAlignment	channel_align;
 
-		Params():	id(LLUUID("")), chiclet(NULL), 
-					channel_right_bound(0), channel_width(0), 
-					display_toasts_always(false), align(NA_BOTTOM)
+		Params():	id(LLUUID("")), display_toasts_always(false), toast_align(NA_BOTTOM), channel_align(CA_LEFT)
 		{}
 	};
 
 	struct ChannelElem
 	{
 		LLUUID				id;
-		LLChiclet*			chiclet;
 		LLScreenChannel*	channel;
 
-		ChannelElem() : id(LLUUID("")), chiclet(NULL), channel(NULL) { }
+		ChannelElem() : id(LLUUID("")), channel(NULL) { }
 
 		ChannelElem(const ChannelElem &elem)
 		{
 			id = elem.id;
-			chiclet = elem.chiclet;
 			channel = elem.channel;
 		}
 
@@ -85,12 +78,6 @@ public:
 		{
 			return (id == id_op);
 		}
-
-		bool operator == (const LLChiclet* chiclet_op) const
-		{
-			return (chiclet == chiclet_op);
-		}
-
 	};
 
 	LLChannelManager();	
@@ -101,17 +88,17 @@ public:
 	// removes a channel intended for the startup toast and allows other channels to show their toasts
 	void onStartUpToastClose();
 
-	//TODO: make protected? in order to be shure that channels are created only by notification handlers
-	LLScreenChannel*	createChannel(LLChannelManager::Params& p);
+	// creates a new ScreenChannel according to the given parameters or returns existing if present
+	LLScreenChannel*	getChannel(LLChannelManager::Params& p);
+
+	// returns a channel by its ID
+	LLScreenChannel*	findChannelByID(const LLUUID id);
 
-	LLScreenChannel*	getChannelByID(const LLUUID id);
-	LLScreenChannel*	getChannelByChiclet(const LLChiclet* chiclet);
+	// creator of the Notification channel, that is used in more than one handler
+	LLScreenChannel*	createNotificationChannel();
 
 	// remove channel methods
 	void	removeChannelByID(const LLUUID id);
-	void	removeChannelByChiclet(const LLChiclet* chiclet);
-
-	void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
 private: