merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3

* Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816
* Major Bugs: EXT-1142 (timeout during login due to processing group IMs)
* Changes: EXT-1216 (minimize message well)

1 files changed, 40 insertions, 33 deletions

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 254e16e1fb..1c144b11b0 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -48,6 +48,7 @@
 #include "lltrans.h"
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
+#include "lltransientfloatermgr.h"
 
 
 
@@ -62,33 +63,46 @@ LLIMFloater::LLIMFloater(const LLUUID& session_id)
 	mInputEditor(NULL), 
 	mPositioned(false)
 {
-	LLIMModel::LLIMSession* session = get_if_there(LLIMModel::instance().sSessionsMap, mSessionID, (LLIMModel::LLIMSession*)NULL);
-	if(session)
+	EInstantMessage type = LLIMModel::getInstance()->getType(session_id);
+	if(IM_COUNT != type)
 	{
-		mDialog = session->mType;
-	}
+		mDialog = type;
 
-	if (mDialog == IM_NOTHING_SPECIAL)
-	{
-		mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelIMControl, this);
-	}
-	else
-	{
-		mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this);
+		if (IM_NOTHING_SPECIAL == mDialog || IM_SESSION_P2P_INVITE == mDialog)
+		{
+			mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelIMControl, this);
+		}
+		else
+		{
+			mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this);
+		}
 	}
-// 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_im_session.xml");
 
 	LLUI::getRootView()->setFocusLostCallback(boost::bind(&LLIMFloater::focusChangeCallback, this));
 
 	mCloseSignal.connect(boost::bind(&LLIMFloater::onClose, this));
+
+	LLTransientFloaterMgr::getInstance()->registerTransientFloater(this);
 }
 
 void LLIMFloater::onClose()
 {
 	LLIMModel::instance().sendLeaveSession(mSessionID, mOtherParticipantUUID);
+
+	//*TODO - move to the IMModel::sendLeaveSession() for the integrity (IB)
 	gIMMgr->removeSession(mSessionID);
 }
 
+void LLIMFloater::setMinimized(BOOL minimize)
+{
+	if(!isDocked())
+	{
+		setVisible(!minimize);
+	}	
+
+	LLFloater::setMinimized(minimize);
+}
+
 /* static */
 void LLIMFloater::newIMCallback(const LLSD& data){
 	
@@ -152,16 +166,17 @@ void LLIMFloater::sendMsg()
 
 LLIMFloater::~LLIMFloater()
 {
+	LLTransientFloaterMgr::getInstance()->unregisterTransientFloater(this);
 }
 
 //virtual
 BOOL LLIMFloater::postBuild()
 {
-	LLIMModel::LLIMSession* session = get_if_there(LLIMModel::instance().sSessionsMap, mSessionID, (LLIMModel::LLIMSession*)NULL);
-	if(session)
+	const LLUUID& other_party_id = LLIMModel::getInstance()->getOtherParticipantID(mSessionID);
+	if (other_party_id.notNull())
 	{
-		mOtherParticipantUUID = session->mOtherParticipantID;
-		mControlPanel->setID(session->mOtherParticipantID);
+		mOtherParticipantUUID = other_party_id;
+		mControlPanel->setID(mOtherParticipantUUID);
 	}
 
 	LLButton* slide_left = getChild<LLButton>("slide_left_btn");
@@ -216,17 +231,6 @@ void* LLIMFloater::createPanelGroupControl(void* userdata)
 	return self->mControlPanel;
 }
 
-
-
-void LLIMFloater::focusChangeCallback()
-{
-	// hide docked floater if user clicked inside in-world area
-	if (isDocked())
-	{
-		setVisible(false);
-	}
-}
-
 void LLIMFloater::onSlide()
 {
 	LLPanel* im_control_panel = getChild<LLPanel>("panel_im_control_panel");
@@ -271,13 +275,13 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
 		}
 
 		floater->setDockControl(new LLDockControl(chiclet, floater, floater->getDockTongue(),
-				LLDockControl::TOP,  boost::bind(&LLIMFloater::getEnabledRect, floater, _1)));
+				LLDockControl::TOP,  boost::bind(&LLIMFloater::getAllowedRect, floater, _1)));
 	}
 
 	return floater;
 }
 
-void LLIMFloater::getEnabledRect(LLRect& rect)
+void LLIMFloater::getAllowedRect(LLRect& rect)
 {
 	rect = gViewerWindow->getWorldViewRect();
 }
@@ -285,8 +289,10 @@ void LLIMFloater::getEnabledRect(LLRect& rect)
 void LLIMFloater::setDocked(bool docked, bool pop_on_undock)
 {
 	// update notification channel state
-	LLNotificationsUI::LLScreenChannel* channel = LLNotificationsUI::LLChannelManager::getInstance()->
-											findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
+	LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>
+		(LLNotificationsUI::LLChannelManager::getInstance()->
+											findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
+	
 	LLDockableFloater::setDocked(docked, pop_on_undock);
 
 	// update notification channel state
@@ -298,8 +304,9 @@ void LLIMFloater::setDocked(bool docked, bool pop_on_undock)
 
 void LLIMFloater::setVisible(BOOL visible)
 {
-	LLNotificationsUI::LLScreenChannel* channel = LLNotificationsUI::LLChannelManager::getInstance()->
-											findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID")));
+	LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>
+		(LLNotificationsUI::LLChannelManager::getInstance()->
+											findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID"))));
 	LLDockableFloater::setVisible(visible);
 
 	// update notification channel state