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, 21 insertions, 17 deletions

diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index 05e63a60c5..9248747c43 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -57,13 +57,14 @@ public:
 	typedef boost::function<void (LLToast* toast)> toast_callback_t;
 	typedef boost::signals2::signal<void (LLToast* toast)> toast_signal_t;
 
-	struct Params :	public LLInitParam::Block<Params, LLFloater::Params>
+	struct Params
 	{
 		LLPanel*			panel;
-		LLUUID				id;	 //notification or message ID
+		LLUUID				notif_id;	 //notification ID
+		LLUUID				session_id;	 //im session ID
 		LLNotificationPtr	notification;
 		F32					timer_period;
-		toast_callback_t	on_toast_destroy;
+		toast_callback_t	on_delete_toast;
 		toast_callback_t	on_mouse_enter;
 		bool				can_fade;
 		bool				can_be_stored;
@@ -100,8 +101,6 @@ public:
 	void insertPanel(LLPanel* panel);
 	// get toast's panel
 	LLPanel* getPanel() { return mPanel; }
-	// discard notification
-	void discardNotification();
 	// enable/disable Toast's Hide button
 	void setHideButtonEnabled(bool enabled);
 	// initialize and start Toast's timer
@@ -120,8 +119,12 @@ public:
 
 
 	// get/set Toast's flags or states
-	// get information whether the notification corresponding to the toast is responded or not
-	bool getIsNotificationUnResponded();
+	// get information whether the notification corresponding to the toast is valid or not
+	bool isNotificationValid();
+	// get toast's Notification ID
+	const LLUUID getNotificationID() { return mNotificationID;}
+	// get toast's Session ID
+	const LLUUID getSessionID() { return mSessionID;}
 	//
 	void setCanFade(bool can_fade);
 	//
@@ -132,18 +135,18 @@ public:
 	void setModal(bool modal);
 
 
-	// Registers callbacks for events
-	toast_signal_t mOnFade;
-	toast_signal_t mOnMousEnter;
-	toast_signal_t mOnToastDestroy;
-	boost::signals2::connection setOnFadeCallback(toast_callback_t cb) { return mOnFade.connect(cb); }
-	boost::signals2::connection setOnMouseEnterCallback(toast_callback_t cb) { return mOnMousEnter.connect(cb); }
-	boost::signals2::connection setOnToastDestroyCallback(toast_callback_t cb) { return mOnToastDestroy.connect(cb); }
+	// Registers signals/callbacks for events
+	toast_signal_t mOnFadeSignal;
+	toast_signal_t mOnMouseEnterSignal;
+	toast_signal_t mOnDeleteToastSignal;
+	toast_signal_t mOnToastDestroyedSignal;
+	boost::signals2::connection setOnFadeCallback(toast_callback_t cb) { return mOnFadeSignal.connect(cb); }
+	boost::signals2::connection setOnToastDestroyedCallback(toast_callback_t cb) { return mOnToastDestroyedSignal.connect(cb); }
 
 	typedef boost::function<void (LLToast* toast, bool mouse_enter)> toast_hover_check_callback_t;
 	typedef boost::signals2::signal<void (LLToast* toast, bool mouse_enter)> toast_hover_check_signal_t;
-	toast_hover_check_signal_t mOnToastHover;	
-	boost::signals2::connection setOnToastHoverCallback(toast_hover_check_callback_t cb) { return mOnToastHover.connect(cb); }
+	toast_hover_check_signal_t mOnToastHoverSignal;	
+	boost::signals2::connection setOnToastHoverCallback(toast_hover_check_callback_t cb) { return mOnToastHoverSignal.connect(cb); }
 
 
 private:
@@ -153,7 +156,8 @@ private:
 	// on timer finished function
 	void	tick();
 
-	LLUUID				mID;
+	LLUUID				mNotificationID;
+	LLUUID				mSessionID;
 	LLNotificationPtr	mNotification;
 
 	LLTimer		mTimer;