merge

--HG--
branch : avatar-pipeline

1 files changed, 38 insertions, 14 deletions

diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 155172128b..088884178b 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -62,15 +62,15 @@ LLUUID notification_id_to_object_id(const LLUUID& notification_id)
 //////////////////////////////////////////////////////////////////////////
 
 LLScriptFloater::LLScriptFloater(const LLSD& key)
-: LLTransientDockableFloater(NULL, true, key)
+: LLDockableFloater(NULL, true, key)
 , mScriptForm(NULL)
-, mObjectId(key.asUUID())
 {
 }
 
 bool LLScriptFloater::toggle(const LLUUID& object_id)
 {
-	LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", object_id);
+	LLUUID notification_id = LLScriptFloaterManager::getInstance()->findNotificationId(object_id);
+	LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", notification_id);
 
 	// show existing floater
 	if(floater)
@@ -97,7 +97,10 @@ bool LLScriptFloater::toggle(const LLUUID& object_id)
 
 LLScriptFloater* LLScriptFloater::show(const LLUUID& object_id)
 {
-	LLScriptFloater* floater = LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", object_id);
+	LLUUID notification_id = LLScriptFloaterManager::getInstance()->findNotificationId(object_id);
+	
+	LLScriptFloater* floater = LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id);
+	floater->setObjectId(object_id);
 	floater->createForm(object_id);
 
 	if (floater->getDockControl() == NULL)
@@ -156,19 +159,22 @@ void LLScriptFloater::createForm(const LLUUID& object_id)
 
 void LLScriptFloater::onClose(bool app_quitting)
 {
-	LLScriptFloaterManager::getInstance()->removeNotificationByObjectId(getObjectId());
+	if(getObjectId().notNull())
+	{
+		LLScriptFloaterManager::getInstance()->removeNotificationByObjectId(getObjectId());
+	}
 }
 
 void LLScriptFloater::setDocked(bool docked, bool pop_on_undock /* = true */)
 {
-	LLTransientDockableFloater::setDocked(docked, pop_on_undock);
+	LLDockableFloater::setDocked(docked, pop_on_undock);
 
 	hideToastsIfNeeded();
 }
 
 void LLScriptFloater::setVisible(BOOL visible)
 {
-	LLTransientDockableFloater::setVisible(visible);
+	LLDockableFloater::setVisible(visible);
 
 	hideToastsIfNeeded();
 }
@@ -206,7 +212,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
 	script_notification_map_t::iterator it = mNotifications.find(object_id);
 	if(it != mNotifications.end())
 	{
-		onRemoveNotification(notification_id);
+		onRemoveNotification(it->second.notification_id);
 	}
 
 	LLNotificationData nd = {notification_id};
@@ -228,7 +234,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
 
 void LLScriptFloaterManager::onRemoveNotification(const LLUUID& notification_id)
 {
-	LLUUID object_id = notification_id_to_object_id(notification_id);
+	LLUUID object_id = findObjectId(notification_id);
 	if(object_id.isNull())
 	{
 		llwarns << "Invalid notification, no object id" << llendl;
@@ -241,22 +247,24 @@ void LLScriptFloaterManager::onRemoveNotification(const LLUUID& notification_id)
 	LLUUID channel_id(gSavedSettings.getString("NotificationChannelUUID"));
 	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>
 		(LLChannelManager::getInstance()->findChannelByID(channel_id));
-	if(channel)
+	LLUUID n_toast_id = findNotificationToastId(object_id);
+	if(channel && n_toast_id.notNull())
 	{
-		channel->killToastByNotificationID(findNotificationToastId(object_id));
+		channel->killToastByNotificationID(n_toast_id);
 	}
 
-	mNotifications.erase(object_id);
-
 	// remove related chiclet
 	LLBottomTray::getInstance()->getChicletPanel()->removeChiclet(object_id);
 
 	// close floater
-	LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", object_id);
+	LLScriptFloater* floater = LLFloaterReg::findTypedInstance<LLScriptFloater>("script_floater", notification_id);
 	if(floater)
 	{
+		floater->setObjectId(LLUUID::null);
 		floater->closeFloater();
 	}
+
+	mNotifications.erase(object_id);
 }
 
 void LLScriptFloaterManager::removeNotificationByObjectId(const LLUUID& object_id)
@@ -301,6 +309,22 @@ void LLScriptFloaterManager::setNotificationToastId(const LLUUID& object_id, con
 	}
 }
 
+LLUUID LLScriptFloaterManager::findObjectId(const LLUUID& notification_id)
+{
+	if(notification_id.notNull())
+	{
+		script_notification_map_t::const_iterator it = mNotifications.begin();
+		for(; mNotifications.end() != it; ++it)
+		{
+			if(notification_id == it->second.notification_id)
+			{
+				return it->first;
+			}
+		}
+	}
+	return LLUUID::null;
+}
+
 LLUUID LLScriptFloaterManager::findNotificationId(const LLUUID& object_id)
 {
 	script_notification_map_t::const_iterator it = mNotifications.find(object_id);