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, 14 insertions, 22 deletions

diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index fb7574d68b..97a15759bf 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -44,7 +44,8 @@ using namespace LLNotificationsUI;
 LLToast::LLToast(LLToast::Params p) :	LLFloater(LLSD()), 
 										mPanel(p.panel), 
 										mTimerValue(p.timer_period),  
-										mID(p.id),  
+										mNotificationID(p.notif_id),  
+										mSessionID(p.session_id),
 										mCanFade(p.can_fade),
 										mCanBeStored(p.can_be_stored),
 										mHideBtnEnabled(p.enable_hide_btn),
@@ -73,12 +74,12 @@ LLToast::LLToast(LLToast::Params p) :	LLFloater(LLSD()),
 		setFocus(TRUE);
 	}
 
-
-	if(!p.on_toast_destroy.empty())
-		mOnToastDestroy.connect(p.on_toast_destroy);
+	// init callbacks if present
+	if(!p.on_delete_toast.empty())
+		mOnDeleteToastSignal.connect(p.on_delete_toast);
 
 	if(!p.on_mouse_enter.empty())
-		mOnMousEnter.connect(p.on_mouse_enter);
+		mOnMouseEnterSignal.connect(p.on_mouse_enter);
 }
 
 //--------------------------------------------------------------------------
@@ -102,6 +103,7 @@ void LLToast::setHideButtonEnabled(bool enabled)
 //--------------------------------------------------------------------------
 LLToast::~LLToast()
 {	
+	mOnToastDestroyedSignal(this);
 	if(mIsModal)
 	{
 		gFocusMgr.unlockFocus();
@@ -142,7 +144,7 @@ void LLToast::hide()
 {
 	setVisible(FALSE);
 	mTimer.stop();
-	mOnFade(this);
+	mOnFadeSignal(this);
 }
 
 //--------------------------------------------------------------------------
@@ -160,7 +162,7 @@ void LLToast::tick()
 	{
 		setVisible(FALSE);
 		mTimer.stop();
-		mOnFade(this); 
+		mOnFadeSignal(this); 
 	}
 }
 
@@ -223,7 +225,7 @@ void LLToast::setVisible(BOOL show)
 //--------------------------------------------------------------------------
 void LLToast::onMouseEnter(S32 x, S32 y, MASK mask)
 {
-	mOnToastHover(this, MOUSE_ENTER);
+	mOnToastHoverSignal(this, MOUSE_ENTER);
 
 	setBackgroundOpaque(TRUE);
 	if(mCanFade)
@@ -234,13 +236,13 @@ void LLToast::onMouseEnter(S32 x, S32 y, MASK mask)
 	sendChildToFront(mHideBtn);
 	if(mHideBtn && mHideBtn->getEnabled())
 		mHideBtn->setVisible(TRUE);
-	mOnMousEnter(this);
+	mOnMouseEnterSignal(this);
 }
 
 //--------------------------------------------------------------------------
 void LLToast::onMouseLeave(S32 x, S32 y, MASK mask)
 {	
-	mOnToastHover(this, MOUSE_LEAVE);
+	mOnToastHoverSignal(this, MOUSE_LEAVE);
 
 	if(mCanFade)
 	{
@@ -270,21 +272,11 @@ BOOL LLToast::handleMouseDown(S32 x, S32 y, MASK mask)
 }
 
 //--------------------------------------------------------------------------
-void LLToast::discardNotification()
-{
-	if(mNotification)
-	{
-		mNotification->setIgnored(TRUE);
-		mNotification->respond(mNotification->getResponseTemplate());
-	}
-}
-
-//--------------------------------------------------------------------------
-bool LLToast::getIsNotificationUnResponded()
+bool LLToast::isNotificationValid()
 {
 	if(mNotification)
 	{
-		return !mNotification->isRespondedTo();
+		return !mNotification->isCancelled();
 	}
 	return false;
 }