1 files changed, 78 insertions, 5 deletions

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index c0cc3f1985..967f38bfd2 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -59,9 +59,14 @@
 #include "lltransientfloatermgr.h"
 #include "llinventorymodel.h"
 #include "llrootview.h"
-
 #include "llspeakers.h"
+#include "llsidetray.h"
+
+
+static const S32 RECT_PADDING_NOT_INIT = -1;
+static const S32 RECT_PADDING_NEED_RECALC = -2;
 
+S32 LLIMFloater::sAllowedRectRightPadding = RECT_PADDING_NOT_INIT;
 
 LLIMFloater::LLIMFloater(const LLUUID& session_id)
   : LLTransientDockableFloater(NULL, true, session_id),
@@ -445,19 +450,44 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
 	return floater;
 }
 
+//static
+bool LLIMFloater::resetAllowedRectPadding(const LLSD& newvalue)
+{
+	//reset allowed rect right padding if "SidebarCameraMovement" option 
+	//or sidebar state changed
+	sAllowedRectRightPadding = RECT_PADDING_NEED_RECALC ;
+	return true;
+}
+
 void LLIMFloater::getAllowedRect(LLRect& rect)
 {
+	if (sAllowedRectRightPadding == RECT_PADDING_NOT_INIT) //wasn't initialized
+	{
+		gSavedSettings.getControl("SidebarCameraMovement")->getSignal()->connect(boost::bind(&LLIMFloater::resetAllowedRectPadding, _2));
+
+		LLSideTray*	side_bar = LLSideTray::getInstance();
+		side_bar->getCollapseSignal().connect(boost::bind(&LLIMFloater::resetAllowedRectPadding, _2));
+		sAllowedRectRightPadding = RECT_PADDING_NEED_RECALC;
+	}
+
 	rect = gViewerWindow->getWorldViewRectScaled();
-	static S32 right_padding = 0;
-	if (right_padding == 0)
+	if (sAllowedRectRightPadding == RECT_PADDING_NEED_RECALC) //recalc allowed rect right padding
 	{
 		LLPanel* side_bar_tabs =
 				gViewerWindow->getRootView()->getChild<LLPanel> (
 						"side_bar_tabs");
-		right_padding = side_bar_tabs->getRect().getWidth();
+		sAllowedRectRightPadding = side_bar_tabs->getRect().getWidth();
 		LLTransientFloaterMgr::getInstance()->addControlView(side_bar_tabs);
+
+		if (gSavedSettings.getBOOL("SidebarCameraMovement") == FALSE)
+		{
+			LLSideTray*	side_bar = LLSideTray::getInstance();
+
+			if (side_bar->getVisible() && !side_bar->getCollapsed())
+				sAllowedRectRightPadding += side_bar->getRect().getWidth();
+		}
 	}
-	rect.mRight -= right_padding;
+	rect.mRight -= sAllowedRectRightPadding;
 }
 
 void LLIMFloater::setDocked(bool docked, bool pop_on_undock)
@@ -1105,6 +1135,21 @@ void LLIMFloater::closeHiddenIMToasts()
 		channel->closeHiddenToasts(IMToastMatcher());
 	}
 }
+// static
+void LLIMFloater::confirmLeaveCallCallback(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+	const LLSD& payload = notification["payload"];
+	LLUUID session_id = payload["session_id"];
+
+	LLFloater* im_floater = LLFloaterReg::findInstance("impanel", session_id);
+	if (option == 0 && im_floater != NULL)
+	{
+		im_floater->closeFloater();
+	}
+
+	return;
+}
 
 // static
 bool LLIMFloater::isChatMultiTab()
@@ -1155,3 +1200,31 @@ void LLIMFloater::onIMChicletCreated( const LLUUID& session_id )
 	}
 
 }
+
+void	LLIMFloater::onClickCloseBtn()
+{
+
+	LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(
+				mSessionID);
+
+	if (session == NULL)
+	{
+		llwarns << "Empty session." << llendl;
+		return;
+	}
+
+	bool is_call_with_chat = session->isGroupSessionType()
+			|| session->isAdHocSessionType() || session->isP2PSessionType();
+
+	LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(mSessionID);
+
+	if (is_call_with_chat && voice_channel != NULL && voice_channel->isActive())
+	{
+		LLSD payload;
+		payload["session_id"] = mSessionID;
+		LLNotificationsUtil::add("ConfirmLeaveCall", LLSD(), payload, confirmLeaveCallCallback);
+		return;
+	}
+
+	LLFloater::onClickCloseBtn();
+}