1 files changed, 510 insertions, 363 deletions

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 63eedcdfea..5e0e0973fc 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -28,84 +28,58 @@
 
 #include "llimfloater.h"
 
+#include "lldraghandle.h"
 #include "llnotificationsutil.h"
 
 #include "llagent.h"
 #include "llappviewer.h"
+#include "llavataractions.h"
 #include "llavatarnamecache.h"
 #include "llbutton.h"
 #include "llchannelmanager.h"
 #include "llchiclet.h"
 #include "llchicletbar.h"
 #include "llfloaterreg.h"
+#include "llfloateravatarpicker.h"
 #include "llimfloatercontainer.h" // to replace separate IM Floaters with multifloater container
 #include "llinventoryfunctions.h"
-#include "lllayoutstack.h"
-#include "lllineeditor.h"
+//#include "lllayoutstack.h"
+#include "llchatentry.h"
 #include "lllogchat.h"
-#include "llpanelimcontrolpanel.h"
 #include "llscreenchannel.h"
 #include "llsyswellwindow.h"
 #include "lltrans.h"
 #include "llchathistory.h"
 #include "llnotifications.h"
 #include "llviewerwindow.h"
-#include "llvoicechannel.h"
 #include "lltransientfloatermgr.h"
 #include "llinventorymodel.h"
 #include "llrootview.h"
 #include "llspeakers.h"
 #include "llviewerchat.h"
+#include "llnotificationmanager.h"
 #include "llautoreplace.h"
 
 LLIMFloater::LLIMFloater(const LLUUID& session_id)
-  : LLTransientDockableFloater(NULL, true, session_id),
-	mControlPanel(NULL),
-	mSessionID(session_id),
+  : LLIMConversation(session_id),
 	mLastMessageIndex(-1),
 	mDialog(IM_NOTHING_SPECIAL),
-	mChatHistory(NULL),
 	mInputEditor(NULL),
 	mSavedTitle(),
 	mTypingStart(),
 	mShouldSendTypingState(false),
+	mChatHistory(NULL),
 	mMeTyping(false),
 	mOtherTyping(false),
 	mTypingTimer(),
 	mTypingTimeoutTimer(),
 	mPositioned(false),
-	mSessionInitialized(false)
+	mSessionInitialized(false),
+	mStartConferenceInSameFloater(false)
 {
-	LLIMModel::LLIMSession* im_session = LLIMModel::getInstance()->findIMSession(mSessionID);
-	if (im_session)
-	{
-		mSessionInitialized = im_session->mSessionInitialized;
+	mIsNearbyChat = false;
+	initIMSession(session_id);
 		
-		mDialog = im_session->mType;
-		switch(mDialog){
-		case IM_NOTHING_SPECIAL:
-		case IM_SESSION_P2P_INVITE:
-			mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelIMControl, this);
-			break;
-		case IM_SESSION_CONFERENCE_START:
-			mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelAdHocControl, this);
-			break;
-		case IM_SESSION_GROUP_START:
-			mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this);
-			break;
-		case IM_SESSION_INVITE:		
-			if (gAgent.isInGroup(mSessionID))
-			{
-				mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelGroupControl, this);
-			}
-			else
-			{
-				mFactoryMap["panel_im_control_panel"] = LLCallbackMap(createPanelAdHocControl, this);
-			}
-			break;
-		default: break;
-		}
-	}
 	setOverlapsScreenChannel(true);
 
 	LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::IM, this);
@@ -133,30 +107,58 @@ void LLIMFloater::onFocusReceived()
 }
 
 // virtual
-void LLIMFloater::onClose(bool app_quitting)
+void LLIMFloater::refresh()
+{
+	if (mMeTyping)
 {
+		// Time out if user hasn't typed for a while.
+		if (mTypingTimeoutTimer.getElapsedTimeF32() > LLAgent::TYPING_TIMEOUT_SECS)
+		{
 	setTyping(false);
+		}
+	}
+}
 
-	// The source of much argument and design thrashing
-	// Should the window hide or the session close when the X is clicked?
-	//
-	// Last change:
-	// EXT-3516 X Button should end IM session, _ button should hide
-	gIMMgr->leaveSession(mSessionID);
+// virtual
+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;
+	}
+
+	LLIMConversation::onClickCloseBtn();
 }
 
 /* static */
-void LLIMFloater::newIMCallback(const LLSD& data){
-	
+void LLIMFloater::newIMCallback(const LLSD& data)
+{
 	if (data["num_unread"].asInteger() > 0 || data["from_id"].asUUID().isNull())
 	{
 		LLUUID session_id = data["session_id"].asUUID();
 
 		LLIMFloater* floater = LLFloaterReg::findTypedInstance<LLIMFloater>("impanel", session_id);
-		if (floater == NULL) return;
 
         // update if visible, otherwise will be updated when opened
-		if (floater->getVisible())
+		if (floater && floater->getVisible())
 		{
 			floater->updateMessages();
 		}
@@ -189,17 +191,15 @@ void LLIMFloater::onSendMsg( LLUICtrl* ctrl, void* userdata )
 
 void LLIMFloater::sendMsg()
 {
-	if (!gAgent.isGodlike() 
-		&& (mDialog == IM_NOTHING_SPECIAL)
-		&& mOtherParticipantUUID.isNull())
+	if (gAgent.isGodlike()
+		|| (mDialog != IM_NOTHING_SPECIAL)
+		|| !mOtherParticipantUUID.isNull())
 	{
-		llinfos << "Cannot send IM to everyone unless you're a god." << llendl;
-		return;
-	}
-
 	if (mInputEditor)
 	{
-		LLWString text = mInputEditor->getConvertedText();
+			LLWString text = mInputEditor->getWText();
+			LLWStringUtil::trim(text);
+			LLWStringUtil::replaceChar(text,182,'\n'); // Convert paragraph symbols back into newlines.
 		if(!text.empty())
 		{
 			// Truncate and convert to UTF8 for transport
@@ -208,8 +208,7 @@ void LLIMFloater::sendMsg()
 			
 			if (mSessionInitialized)
 			{
-				LLIMModel::sendMessage(utf8_text, mSessionID,
-					mOtherParticipantUUID,mDialog);
+					LLIMModel::sendMessage(utf8_text, mSessionID, mOtherParticipantUUID, mDialog);
 			}
 			else
 			{
@@ -223,95 +222,316 @@ void LLIMFloater::sendMsg()
 		}
 	}
 }
-
-
+	else
+	{
+		llinfos << "Cannot send IM to everyone unless you're a god." << llendl;
+	}
+}
 
 LLIMFloater::~LLIMFloater()
 {
+	mParticipantsListRefreshConnection.disconnect();
+	mVoiceChannelStateChangeConnection.disconnect();
+	if(LLVoiceClient::instanceExists())
+	{
+		LLVoiceClient::getInstance()->removeObserver(this);
+	}
+
 	LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, this);
 }
 
-//virtual
-BOOL LLIMFloater::postBuild()
+void LLIMFloater::initIMSession(const LLUUID& session_id)
 {
-	const LLUUID& other_party_id = LLIMModel::getInstance()->getOtherParticipantID(mSessionID);
+	// Change the floater key to bind it to a new session.
+	setKey(session_id);
+
+	mSessionID = session_id;
+	mSession = LLIMModel::getInstance()->findIMSession(mSessionID);
+
+	if (mSession)
+{
+		mIsP2PChat = mSession->isP2PSessionType();
+		mSessionInitialized = mSession->mSessionInitialized;
+
+		mDialog = mSession->mType;
+	}
+}
+
+void LLIMFloater::initIMFloater()
+{
+	const LLUUID& other_party_id =
+			LLIMModel::getInstance()->getOtherParticipantID(mSessionID);
 	if (other_party_id.notNull())
 	{
 		mOtherParticipantUUID = other_party_id;
 	}
 
-	mControlPanel->setSessionId(mSessionID);
-	mControlPanel->getParent()->setVisible(gSavedSettings.getBOOL("IMShowControlPanel"));
+	boundVoiceChannel();
+
+	mTypingStart = LLTrans::getString("IM_typing_start_string");
+
+	// Show control panel in torn off floaters only.
+	mParticipantListPanel->setVisible(!getHost() && gSavedSettings.getBOOL("IMShowControlPanel"));
+
+	// Disable input editor if session cannot accept text
+	if ( mSession && !mSession->mTextIMPossible )
+	{
+		mInputEditor->setEnabled(FALSE);
+		mInputEditor->setLabel(LLTrans::getString("IM_unavailable_text_label"));
+	}
+
+	if (mIsP2PChat)
+	{
+		// look up display name for window title
+		LLAvatarNameCache::get(mSession->mOtherParticipantID,
+							   boost::bind(&LLIMFloater::onAvatarNameCache,
+										   this, _1, _2));
+	}
+	else
+	{
+		std::string session_name(LLIMModel::instance().getName(mSessionID));
+		updateSessionName(session_name, session_name);
+
+		// For ad hoc conferences we should update the title with participants names.
+		if ((IM_SESSION_INVITE == mDialog && !gAgent.isInGroup(mSessionID))
+						|| mDialog == IM_SESSION_CONFERENCE_START)
+		{
+			if (mParticipantsListRefreshConnection.connected())
+			{
+				mParticipantsListRefreshConnection.disconnect();
+			}
 
-	LLButton* slide_left = getChild<LLButton>("slide_left_btn");
-	slide_left->setVisible(mControlPanel->getParent()->getVisible());
-	slide_left->setClickedCallback(boost::bind(&LLIMFloater::onSlide, this));
+			LLAvatarList* avatar_list = getChild<LLAvatarList>("speakers_list");
+			mParticipantsListRefreshConnection = avatar_list->setRefreshCompleteCallback(
+					boost::bind(&LLIMFloater::onParticipantsListChanged, this, _1));
+		}
+	}
+}
 
-	LLButton* slide_right = getChild<LLButton>("slide_right_btn");
-	slide_right->setVisible(!mControlPanel->getParent()->getVisible());
-	slide_right->setClickedCallback(boost::bind(&LLIMFloater::onSlide, this));
+//virtual
+BOOL LLIMFloater::postBuild()
+{
+	LLIMConversation::postBuild();
 
-	mInputEditor = getChild<LLLineEditor>("chat_editor");
+	mInputEditor = getChild<LLChatEntry>("chat_editor");
 	mInputEditor->setMaxTextLength(1023);
 	// enable line history support for instant message bar
-	mInputEditor->setEnableLineHistory(TRUE);
+	// XXX stinson TODO : resolve merge conflict
+#if 0
 	// *TODO Establish LineEditor with autoreplace callback
 	mInputEditor->setAutoreplaceCallback(boost::bind(&LLAutoReplace::autoreplaceCallback, LLAutoReplace::getInstance(), _1, _2));
+#endif
 
 	LLFontGL* font = LLViewerChat::getChatFont();
 	mInputEditor->setFont(font);	
 	
 	mInputEditor->setFocusReceivedCallback( boost::bind(onInputEditorFocusReceived, _1, this) );
 	mInputEditor->setFocusLostCallback( boost::bind(onInputEditorFocusLost, _1, this) );
-	mInputEditor->setKeystrokeCallback( onInputEditorKeystroke, this );
+	mInputEditor->setKeystrokeCallback( boost::bind(onInputEditorKeystroke, _1, this) );
 	mInputEditor->setCommitOnFocusLost( FALSE );
-	mInputEditor->setRevertOnEsc( FALSE );
-	mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
 	mInputEditor->setPassDelete( TRUE );
 
-	childSetCommitCallback("chat_editor", onSendMsg, this);
+	mInputEditor->setCommitCallback(boost::bind(onSendMsg, _1, this));
 	
 	mChatHistory = getChild<LLChatHistory>("chat_history");
 
 	setDocked(true);
 
-	mTypingStart = LLTrans::getString("IM_typing_start_string");
+	LLButton* add_btn = getChild<LLButton>("add_btn");
 
-	// Disable input editor if session cannot accept text
-	LLIMModel::LLIMSession* im_session =
-		LLIMModel::instance().findIMSession(mSessionID);
-	if( im_session && !im_session->mTextIMPossible )
+	// Allow to add chat participants depending on the session type
+	add_btn->setEnabled(isInviteAllowed());
+	add_btn->setClickedCallback(boost::bind(&LLIMFloater::onAddButtonClicked, this));
+
+	childSetAction("voice_call_btn", boost::bind(&LLIMFloater::onCallButtonClicked, this));
+
+	LLVoiceClient::getInstance()->addObserver(this);
+	
+	//*TODO if session is not initialized yet, add some sort of a warning message like "starting session...blablabla"
+	//see LLFloaterIMPanel for how it is done (IB)
+
+	initIMFloater();
+
+	// Add a conversation list item in the left pane
+	LLIMFloaterContainer* im_box = LLIMFloaterContainer::getInstance();
+	im_box->addConversationListItem(getTitle(), getKey(), this);
+
+	return TRUE;
+}
+
+void LLIMFloater::onAddButtonClicked()
 	{
-		mInputEditor->setEnabled(FALSE);
-		mInputEditor->setLabel(LLTrans::getString("IM_unavailable_text_label"));
+       LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&LLIMFloater::addSessionParticipants, this, _1), TRUE, TRUE);
+       if (!picker)
+       {
+               return;
 	}
 
-	if ( im_session && im_session->isP2PSessionType())
+       // Need to disable 'ok' button when selected users are already in conversation.
+       picker->setOkBtnEnableCb(boost::bind(&LLIMFloater::canAddSelectedToChat, this, _1));
+       LLFloater* root_floater = gFloaterView->getParentFloater(this);
+       if (root_floater)
 	{
-		// look up display name for window title
-		LLAvatarNameCache::get(im_session->mOtherParticipantID,
-							   boost::bind(&LLIMFloater::onAvatarNameCache,
-										   this, _1, _2));
+               root_floater->addDependentFloater(picker);
+	}
+}
+
+bool LLIMFloater::canAddSelectedToChat(const uuid_vec_t& uuids)
+{
+	if (!mSession
+		|| mDialog == IM_SESSION_GROUP_START
+		|| mDialog == IM_SESSION_INVITE && gAgent.isInGroup(mSessionID))
+	{
+		return false;
+	}
+
+	if (mIsP2PChat)
+	{
+		// For a P2P session just check if we are not adding the other participant.
+
+		for (uuid_vec_t::const_iterator id = uuids.begin();
+				id != uuids.end(); ++id)
+		{
+			if (*id == mOtherParticipantUUID)
+			{
+				return false;
+			}
+		}
 	}
 	else
 	{
-		std::string session_name(LLIMModel::instance().getName(mSessionID));
-		updateSessionName(session_name, session_name);
+		// For a conference session we need to check against the list from LLSpeakerMgr,
+		// because this list may change when participants join or leave the session.
+
+		LLSpeakerMgr::speaker_list_t speaker_list;
+		LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);
+		if (speaker_mgr)
+		{
+			speaker_mgr->getSpeakerList(&speaker_list, true);
 	}
 	
-	//*TODO if session is not initialized yet, add some sort of a warning message like "starting session...blablabla"
-	//see LLFloaterIMPanel for how it is done (IB)
+		for (uuid_vec_t::const_iterator id = uuids.begin();
+				id != uuids.end(); ++id)
+		{
+			for (LLSpeakerMgr::speaker_list_t::const_iterator it = speaker_list.begin();
+					it != speaker_list.end(); ++it)
+			{
+				const LLPointer<LLSpeaker>& speaker = *it;
+				if (*id == speaker->mID)
+				{
+					return false;
+				}
+			}
+		}
+	}
 
-	if(isChatMultiTab())
+	return true;
+}
+
+void LLIMFloater::addSessionParticipants(const uuid_vec_t& uuids)
+	{
+	if (mIsP2PChat)
 	{
-		return LLFloater::postBuild();
+		mStartConferenceInSameFloater = true;
+
+		uuid_vec_t temp_ids;
+
+		// Add the initial participant of a P2P session
+		temp_ids.push_back(mOtherParticipantUUID);
+		temp_ids.insert(temp_ids.end(), uuids.begin(), uuids.end());
+
+		LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(mSessionID);
+
+		// first check whether this is a voice session
+		bool is_voice_call = voice_channel != NULL && voice_channel->isActive();
+
+		// then we can close the current session
+		onClose(false);
+
+		// Start a new ad hoc voice call if we invite new participants to a P2P call,
+		// or start a text chat otherwise.
+		if (is_voice_call)
+		{
+			LLAvatarActions::startAdhocCall(temp_ids, mSessionID);
+	}
+	else
+	{
+			LLAvatarActions::startConference(temp_ids, mSessionID);
 	}
+}
 	else
 	{
-		return LLDockableFloater::postBuild();
+		inviteToSession(uuids);
 	}
 }
 
+void LLIMFloater::boundVoiceChannel()
+{
+	LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(mSessionID);
+	if(voice_channel)
+	{
+		mVoiceChannelStateChangeConnection = voice_channel->setStateChangedCallback(
+				boost::bind(&LLIMFloater::onVoiceChannelStateChanged, this, _1, _2));
+
+		//call (either p2p, group or ad-hoc) can be already in started state
+		bool callIsActive = voice_channel->getState() >= LLVoiceChannel::STATE_CALL_STARTED;
+		updateCallBtnState(callIsActive);
+	}
+}
+
+void LLIMFloater::enableDisableCallBtn()
+{
+	bool voice_enabled = LLVoiceClient::getInstance()->voiceEnabled()
+			&& LLVoiceClient::getInstance()->isVoiceWorking();
+
+	if (mSession)
+	{
+		bool session_initialized = mSession->mSessionInitialized;
+		bool callback_enabled = mSession->mCallBackEnabled;
+
+		BOOL enable_connect =
+				session_initialized && voice_enabled && callback_enabled;
+		getChildView("voice_call_btn")->setEnabled(enable_connect);
+	}
+	else
+	{
+		getChildView("voice_call_btn")->setEnabled(false);
+	}
+}
+
+
+void LLIMFloater::onCallButtonClicked()
+{
+	LLVoiceChannel* voice_channel = LLIMModel::getInstance()->getVoiceChannel(mSessionID);
+	if (voice_channel)
+	{
+		bool is_call_active = voice_channel->getState() >= LLVoiceChannel::STATE_CALL_STARTED;
+	    if (is_call_active)
+	    {
+		    gIMMgr->endCall(mSessionID);
+	    }
+	    else
+	    {
+		    gIMMgr->startCall(mSessionID);
+	    }
+	}
+}
+
+void LLIMFloater::onChange(EStatusType status, const std::string &channelURI, bool proximal)
+{
+	if(status != STATUS_JOINING && status != STATUS_LEFT_CHANNEL)
+	{
+		enableDisableCallBtn();
+	}
+}
+
+void LLIMFloater::onVoiceChannelStateChanged(
+		const LLVoiceChannel::EState& old_state, const LLVoiceChannel::EState& new_state)
+{
+	bool callIsActive = new_state >= LLVoiceChannel::STATE_CALL_STARTED;
+	updateCallBtnState(callIsActive);
+}
+
 void LLIMFloater::updateSessionName(const std::string& ui_title,
 									const std::string& ui_label)
 {
@@ -329,58 +549,59 @@ void LLIMFloater::onAvatarNameCache(const LLUUID& agent_id,
 	mTypingStart.setArg("[NAME]", ui_title);
 }
 
-// virtual
-void LLIMFloater::draw()
+void LLIMFloater::onParticipantsListChanged(LLUICtrl* ctrl)
 {
-	if ( mMeTyping )
+	LLAvatarList* avatar_list = dynamic_cast<LLAvatarList*>(ctrl);
+	if (!avatar_list)
 	{
-		// Time out if user hasn't typed for a while.
-		if ( mTypingTimeoutTimer.getElapsedTimeF32() > LLAgent::TYPING_TIMEOUT_SECS )
-		{
-			setTyping(false);
+		return;
 		}
-	}
 
-	LLTransientDockableFloater::draw();
-}
+	bool all_names_resolved = true;
+	std::vector<LLSD> participants_uuids;
 
+	avatar_list->getValues(participants_uuids);
 
-// static
-void* LLIMFloater::createPanelIMControl(void* userdata)
+	// Check whether we have all participants names in LLAvatarNameCache
+	for (std::vector<LLSD>::const_iterator it = participants_uuids.begin(); it != participants_uuids.end(); ++it)
 {
-	LLIMFloater *self = (LLIMFloater*)userdata;
-	self->mControlPanel = new LLPanelIMControlPanel();
-	self->mControlPanel->setXMLFilename("panel_im_control_panel.xml");
-	return self->mControlPanel;
-}
-
+		const LLUUID& id = it->asUUID();
+		LLAvatarName av_name;
+		if (!LLAvatarNameCache::get(id, &av_name))
+		{
+			all_names_resolved = false;
 
-// static
-void* LLIMFloater::createPanelGroupControl(void* userdata)
-{
-	LLIMFloater *self = (LLIMFloater*)userdata;
-	self->mControlPanel = new LLPanelGroupControlPanel(self->mSessionID);
-	self->mControlPanel->setXMLFilename("panel_group_control_panel.xml");
-	return self->mControlPanel;
+			// If a name is not found in cache, request it and continue the process recursively
+			// until all ids are resolved into names.
+			LLAvatarNameCache::get(id,
+					boost::bind(&LLIMFloater::onParticipantsListChanged, this, avatar_list));
+			break;
+		}
 }
 
-// static
-void* LLIMFloater::createPanelAdHocControl(void* userdata)
+	if (all_names_resolved)
+	{
+		std::vector<LLAvatarName> avatar_names;
+		std::vector<LLSD>::const_iterator it = participants_uuids.begin();
+		for (; it != participants_uuids.end(); ++it)
+		{
+			const LLUUID& id = it->asUUID();
+			LLAvatarName av_name;
+			if (LLAvatarNameCache::get(id, &av_name))
 {
-	LLIMFloater *self = (LLIMFloater*)userdata;
-	self->mControlPanel = new LLPanelAdHocControlPanel(self->mSessionID);
-	self->mControlPanel->setXMLFilename("panel_adhoc_control_panel.xml");
-	return self->mControlPanel;
+				avatar_names.push_back(av_name);
+			}
 }
 
-void LLIMFloater::onSlide()
+		// We should check whether the vector is not empty to pass the assertion
+		// that avatar_names.size() > 0 in LLAvatarActions::buildResidentsString.
+		if (!avatar_names.empty())
 {
-	mControlPanel->getParent()->setVisible(!mControlPanel->getParent()->getVisible());
-
-	gSavedSettings.setBOOL("IMShowControlPanel", mControlPanel->getParent()->getVisible());
-
-	getChild<LLButton>("slide_left_btn")->setVisible(mControlPanel->getParent()->getVisible());
-	getChild<LLButton>("slide_right_btn")->setVisible(!mControlPanel->getParent()->getVisible());
+			std::string ui_title;
+			LLAvatarActions::buildResidentsString(avatar_names, ui_title);
+			updateSessionName(ui_title, ui_title);
+		}
+}
 }
 
 //static
@@ -388,7 +609,8 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
 {
 	closeHiddenIMToasts();
 
-	if (!gIMMgr->hasSession(session_id)) return NULL;
+	if (!gIMMgr->hasSession(session_id))
+		return NULL;
 
 	if(!isChatMultiTab())
 	{
@@ -405,22 +627,24 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
 		}
 	}
 
+	// Test the existence of the floater before we try to create it
 	bool exist = findInstance(session_id);
 
+	// Get the floater: this will create the instance if it didn't exist
 	LLIMFloater* floater = getInstance(session_id);
-	if (!floater) return NULL;
+	if (!floater)
+		return NULL;
 
 	if(isChatMultiTab())
 	{
 		LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
 
-		// do not add existed floaters to avoid adding torn off instances
+		// Do not add again existing floaters
 		if (!exist)
 		{
 			//		LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
 			// TODO: mantipov: use LLTabContainer::RIGHT_OF_CURRENT if it exists
 			LLTabContainer::eInsertionPoint i_pt = LLTabContainer::END;
-			
 			if (floater_container)
 			{
 				floater_container->addFloater(floater, TRUE, i_pt);
@@ -458,6 +682,37 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
 
 	return floater;
 }
+//static
+LLIMFloater* LLIMFloater::findInstance(const LLUUID& session_id)
+{
+    LLIMFloater* conversation =
+    		LLFloaterReg::findTypedInstance<LLIMFloater>("impanel", session_id);
+
+	return conversation;
+}
+
+LLIMFloater* LLIMFloater::getInstance(const LLUUID& session_id)
+{
+	LLIMFloater* conversation =
+				LLFloaterReg::getTypedInstance<LLIMFloater>("impanel", session_id);
+
+	return conversation;
+}
+
+void LLIMFloater::onClose(bool app_quitting)
+{
+	setTyping(false);
+
+	// The source of much argument and design thrashing
+	// Should the window hide or the session close when the X is clicked?
+	//
+	// Last change:
+	// EXT-3516 X Button should end IM session, _ button should hide
+	gIMMgr->leaveSession(mSessionID);
+
+	// Clean up the conversation *after* the session has been ended
+	LLIMConversation::onClose(app_quitting);
+}
 
 void LLIMFloater::setDocked(bool docked, bool pop_on_undock)
 {
@@ -520,9 +775,12 @@ void LLIMFloater::setVisible(BOOL visible)
 
 BOOL LLIMFloater::getVisible()
 {
+	bool visible;
+
 	if(isChatMultiTab())
 	{
-		LLIMFloaterContainer* im_container = LLIMFloaterContainer::getInstance();
+		LLIMFloaterContainer* im_container =
+				LLIMFloaterContainer::getInstance();
 		
 		// Treat inactive floater as invisible.
 		bool is_active = im_container->getActiveFloater() == this;
@@ -530,16 +788,21 @@ BOOL LLIMFloater::getVisible()
 		//torn off floater is always inactive
 		if (!is_active && getHost() != im_container)
 		{
-			return LLTransientDockableFloater::getVisible();
+			visible = LLTransientDockableFloater::getVisible();
 		}
-
+		else
+		{
 		// getVisible() returns TRUE when Tabbed IM window is minimized.
-		return is_active && !im_container->isMinimized() && im_container->getVisible();
+			visible = is_active && !im_container->isMinimized()
+						&& im_container->getVisible();
+	}
 	}
 	else
 	{
-		return LLTransientDockableFloater::getVisible();
+		visible = LLTransientDockableFloater::getVisible();
 	}
+
+	return visible;
 }
 
 //static
@@ -547,7 +810,8 @@ bool LLIMFloater::toggle(const LLUUID& session_id)
 {
 	if(!isChatMultiTab())
 	{
-		LLIMFloater* floater = LLFloaterReg::findTypedInstance<LLIMFloater>("impanel", session_id);
+		LLIMFloater* floater = LLFloaterReg::findTypedInstance<LLIMFloater>(
+				"impanel", session_id);
 		if (floater && floater->getVisible() && floater->hasFocus())
 		{
 			// clicking on chiclet to close floater just hides it to maintain existing
@@ -568,17 +832,6 @@ bool LLIMFloater::toggle(const LLUUID& session_id)
 	return true;
 }
 
-//static
-LLIMFloater* LLIMFloater::findInstance(const LLUUID& session_id)
-{
-	return LLFloaterReg::findTypedInstance<LLIMFloater>("impanel", session_id);
-}
-
-LLIMFloater* LLIMFloater::getInstance(const LLUUID& session_id)
-{
-	return LLFloaterReg::getTypedInstance<LLIMFloater>("impanel", session_id);
-}
-
 void LLIMFloater::sessionInitReplyReceived(const LLUUID& im_session_id)
 {
 	mSessionInitialized = true;
@@ -586,53 +839,57 @@ void LLIMFloater::sessionInitReplyReceived(const LLUUID& im_session_id)
 	//will be different only for an ad-hoc im session
 	if (mSessionID != im_session_id)
 	{
-		mSessionID = im_session_id;
-		setKey(im_session_id);
-		mControlPanel->setSessionId(im_session_id);
-	}
+		initIMSession(im_session_id);
 
-	// updating "Call" button from group control panel here to enable it without placing into draw() (EXT-4796)
-	if(gAgent.isInGroup(im_session_id))
-	{
-		mControlPanel->updateCallButton();
+		buildParticipantList();
 	}
+
+	initIMFloater();
 	
 	//*TODO here we should remove "starting session..." warning message if we added it in postBuild() (IB)
 
-
 	//need to send delayed messaged collected while waiting for session initialization
-	if (!mQueuedMsgsForInit.size()) return;
+	if (mQueuedMsgsForInit.size())
+	{
 	LLSD::array_iterator iter;
 	for ( iter = mQueuedMsgsForInit.beginArray();
-		iter != mQueuedMsgsForInit.endArray();
-		++iter)
+				iter != mQueuedMsgsForInit.endArray(); ++iter)
 	{
 		LLIMModel::sendMessage(iter->asString(), mSessionID,
 			mOtherParticipantUUID, mDialog);
 	}
 }
+}
 
-void LLIMFloater::updateMessages()
+void LLIMFloater::appendMessage(const LLChat& chat, const LLSD &args)
 {
-	bool use_plain_text_chat_history = gSavedSettings.getBOOL("PlainTextChatHistory");
+	LLChat& tmp_chat = const_cast<LLChat&>(chat);
 
+	if (!chat.mMuted)
+	{
+		tmp_chat.mFromName = chat.mFromName;
+		LLSD chat_args;
+		if (args) chat_args = args;
+		chat_args["use_plain_text_chat_history"] =
+				gSavedSettings.getBOOL("PlainTextChatHistory");
+		chat_args["show_time"] = gSavedSettings.getBOOL("IMShowTime");
+		chat_args["show_names_for_p2p_conv"] = !mIsP2PChat
+				|| gSavedSettings.getBOOL("IMShowNamesForP2PConv");
+
+		mChatHistory->appendMessage(chat, chat_args);
+	}
+}
+
+void LLIMFloater::updateMessages()
+{
 	std::list<LLSD> messages;
 
 	// we shouldn't reset unread message counters if IM floater doesn't have focus
-	if (hasFocus())
-	{
-		LLIMModel::instance().getMessages(mSessionID, messages, mLastMessageIndex+1);
-	}
-	else
-	{
-		LLIMModel::instance().getMessagesSilently(mSessionID, messages, mLastMessageIndex+1);
-	}
+    LLIMModel::instance().getMessages(
+    		mSessionID, messages, mLastMessageIndex + 1, hasFocus());
 
 	if (messages.size())
 	{
-		LLSD chat_args;
-		chat_args["use_plain_text_chat_history"] = use_plain_text_chat_history;
-
 		std::ostringstream message;
 		std::list<LLSD>::const_reverse_iterator iter = messages.rbegin();
 		std::list<LLSD>::const_reverse_iterator iter_end = messages.rend();
@@ -682,7 +939,7 @@ void LLIMFloater::updateMessages()
 				chat.mText = message;
 			}
 			
-			mChatHistory->appendMessage(chat, chat_args);
+			appendMessage(chat);
 			mLastMessageIndex = msg["index"].asInteger();
 
 			// if it is a notification - next message is a notification history log, so skip it
@@ -706,6 +963,7 @@ void LLIMFloater::reloadMessages()
 	mChatHistory->clear();
 	mLastMessageIndex = -1;
 	updateMessages();
+	mInputEditor->setFont(LLViewerChat::getChatFont());
 }
 
 // static
@@ -732,20 +990,14 @@ void LLIMFloater::onInputEditorFocusLost(LLFocusableElement* caller, void* userd
 }
 
 // static
-void LLIMFloater::onInputEditorKeystroke(LLLineEditor* caller, void* userdata)
+void LLIMFloater::onInputEditorKeystroke(LLTextEditor* caller, void* userdata)
 {
 	LLIMFloater* self = (LLIMFloater*)userdata;
 	std::string text = self->mInputEditor->getText();
-	if (!text.empty())
-	{
-		self->setTyping(true);
-	}
-	else
-	{
+
 		// Deleting all text counts as stopping typing.
-		self->setTyping(false);
+	self->setTyping(!text.empty());
 	}
-}
 
 void LLIMFloater::setTyping(bool typing)
 {
@@ -769,27 +1021,25 @@ void LLIMFloater::setTyping(bool typing)
 	// much network traffic. Only send in person-to-person IMs.
 	if ( mShouldSendTypingState && mDialog == IM_NOTHING_SPECIAL )
 	{
-		if ( mMeTyping )
+		// Still typing, send 'start typing' notification or
+		// send 'stop typing' notification immediately
+		if (!mMeTyping || mTypingTimer.getElapsedTimeF32() > 1.f)
 		{
-			if ( mTypingTimer.getElapsedTimeF32() > 1.f )
-			{
-				// Still typing, send 'start typing' notification
-				LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, TRUE);
+			LLIMModel::instance().sendTypingState(mSessionID,
+					mOtherParticipantUUID, mMeTyping);
 				mShouldSendTypingState = false;
+
 			}
 		}
-		else
-		{
-			// Send 'stop typing' notification immediately
-			LLIMModel::instance().sendTypingState(mSessionID, mOtherParticipantUUID, FALSE);
-			mShouldSendTypingState = false;
-		}
-	}
 
+	if (!mIsNearbyChat)
+		{
 	LLIMSpeakerMgr* speaker_mgr = LLIMModel::getInstance()->getSpeakerManager(mSessionID);
 	if (speaker_mgr)
+		{
 		speaker_mgr->setSpeakerTyping(gAgent.getID(), FALSE);
-
+		}
+}
 }
 
 void LLIMFloater::processIMTyping(const LLIMInfo* im_info, BOOL typing)
@@ -808,9 +1058,7 @@ void LLIMFloater::processIMTyping(const LLIMInfo* im_info, BOOL typing)
 
 void LLIMFloater::processAgentListUpdates(const LLSD& body)
 {
-	if ( !body.isMap() ) return;
-
-	if ( body.has("agent_updates") && body["agent_updates"].isMap() )
+	if (body.isMap() && body.has("agent_updates") && body["agent_updates"].isMap())
 	{
 		LLSD agent_data = body["agent_updates"].get(gAgentID.asString());
 		if (agent_data.isMap() && agent_data.has("info"))
@@ -835,30 +1083,6 @@ void LLIMFloater::processAgentListUpdates(const LLSD& body)
 	}
 }
 
-void LLIMFloater::updateChatHistoryStyle()
-{
-	mChatHistory->clear();
-	mLastMessageIndex = -1;
-	updateMessages();
-}
-
-void LLIMFloater::processChatHistoryStyleUpdate(const LLSD& newvalue)
-{
-	LLFontGL* font = LLViewerChat::getChatFont();
-	LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("impanel");
-	for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin();
-		 iter != inst_list.end(); ++iter)
-	{
-		LLIMFloater* floater = dynamic_cast<LLIMFloater*>(*iter);
-		if (floater)
-		{
-			floater->updateChatHistoryStyle();
-			floater->mInputEditor->setFont(font);
-		}
-	}
-
-}
-
 void LLIMFloater::processSessionUpdate(const LLSD& session_update)
 {
 	// *TODO : verify following code when moderated mode will be implemented
@@ -870,7 +1094,8 @@ void LLIMFloater::processSessionUpdate(const LLSD& session_update)
 
 		if (voice_moderated)
 		{
-			setTitle(session_label + std::string(" ") + LLTrans::getString("IM_moderated_chat_label"));
+			setTitle(session_label + std::string(" ")
+							+ LLTrans::getString("IM_moderated_chat_label"));
 		}
 		else
 		{
@@ -883,98 +1108,56 @@ void LLIMFloater::processSessionUpdate(const LLSD& session_update)
 	}
 }
 
-BOOL LLIMFloater::handleDragAndDrop(S32 x, S32 y, MASK mask,
-						   BOOL drop, EDragAndDropType cargo_type,
-						   void *cargo_data, EAcceptance *accept,
+// virtual
+BOOL LLIMFloater::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+									EDragAndDropType cargo_type,
+									void* cargo_data,
+									EAcceptance* accept,
 						   std::string& tooltip_msg)
 {
-
-	if (mDialog == IM_NOTHING_SPECIAL)
+	if (cargo_type == DAD_PERSON)
 	{
-		LLToolDragAndDrop::handleGiveDragAndDrop(mOtherParticipantUUID, mSessionID, drop,
-												 cargo_type, cargo_data, accept);
+		if (dropPerson(static_cast<LLUUID*>(cargo_data), drop))
+	{
+			*accept = ACCEPT_YES_MULTI;
 	}
-
-	// handle case for dropping calling cards (and folders of calling cards) onto invitation panel for invites
-	else if (isInviteAllowed())
+		else
 	{
 		*accept = ACCEPT_NO;
-
-		if (cargo_type == DAD_CALLINGCARD)
-		{
-			if (dropCallingCard((LLInventoryItem*)cargo_data, drop))
-			{
-				*accept = ACCEPT_YES_MULTI;
 			}
 		}
-		else if (cargo_type == DAD_CATEGORY)
+	else if (mDialog == IM_NOTHING_SPECIAL)
 		{
-			if (dropCategory((LLInventoryCategory*)cargo_data, drop))
-			{
-				*accept = ACCEPT_YES_MULTI;
+		LLToolDragAndDrop::handleGiveDragAndDrop(mOtherParticipantUUID, mSessionID, drop,
+				cargo_type, cargo_data, accept);
 			}
-		}
-	}
+
 	return TRUE;
 }
 
-BOOL LLIMFloater::dropCallingCard(LLInventoryItem* item, BOOL drop)
+bool LLIMFloater::dropPerson(LLUUID* person_id, bool drop)
 {
-	BOOL rv = isInviteAllowed();
-	if(rv && item && item->getCreatorUUID().notNull())
+	bool res = person_id && person_id->notNull();
+	if(res)
 	{
-		if(drop)
-		{
 			uuid_vec_t ids;
-			ids.push_back(item->getCreatorUUID());
-			inviteToSession(ids);
-		}
-	}
-	else
+		ids.push_back(*person_id);
+
+		res = canAddSelectedToChat(ids);
+		if(res && drop)
 	{
-		// set to false if creator uuid is null.
-		rv = FALSE;
+			addSessionParticipants(ids);
 	}
-	return rv;
 }
 
-BOOL LLIMFloater::dropCategory(LLInventoryCategory* category, BOOL drop)
-{
-	BOOL rv = isInviteAllowed();
-	if(rv && category)
-	{
-		LLInventoryModel::cat_array_t cats;
-		LLInventoryModel::item_array_t items;
-		LLUniqueBuddyCollector buddies;
-		gInventory.collectDescendentsIf(category->getUUID(),
-										cats,
-										items,
-										LLInventoryModel::EXCLUDE_TRASH,
-										buddies);
-		S32 count = items.count();
-		if(count == 0)
-		{
-			rv = FALSE;
+	return res;
 		}
-		else if(drop)
-		{
-			uuid_vec_t ids;
-			ids.reserve(count);
-			for(S32 i = 0; i < count; ++i)
-			{
-				ids.push_back(items.get(i)->getCreatorUUID());
-			}
-			inviteToSession(ids);
-		}
-	}
-	return rv;
-}
 
 BOOL LLIMFloater::isInviteAllowed() const
 {
-
 	return ( (IM_SESSION_CONFERENCE_START == mDialog)
-			 || (IM_SESSION_INVITE == mDialog) );
+			 || (IM_SESSION_INVITE == mDialog && !gAgent.isInGroup(mSessionID))
+			 || mIsP2PChat);
 }
 
 class LLSessionInviteResponder : public LLHTTPClient::Responder
@@ -998,11 +1181,10 @@ private:
 BOOL LLIMFloater::inviteToSession(const uuid_vec_t& ids)
 {
 	LLViewerRegion* region = gAgent.getRegion();
-	if (!region)
-	{
-		return FALSE;
-	}
+	bool is_region_exist = region != NULL;
 
+	if (is_region_exist)
+	{
 	S32 count = ids.size();
 
 	if( isInviteAllowed() && (count > 0) )
@@ -1024,8 +1206,7 @@ BOOL LLIMFloater::inviteToSession(const uuid_vec_t& ids)
 		LLHTTPClient::post(
 			url,
 			data,
-			new LLSessionInviteResponder(
-					mSessionID));
+					new LLSessionInviteResponder(mSessionID));
 	}
 	else
 	{
@@ -1035,8 +1216,9 @@ BOOL LLIMFloater::inviteToSession(const uuid_vec_t& ids)
 		// successful add, because everyone that needed to get added
 		// was added.
 	}
+	}
 
-	return TRUE;
+	return is_region_exist;
 }
 
 void LLIMFloater::addTypingIndicator(const LLIMInfo* im_info)
@@ -1077,7 +1259,6 @@ void LLIMFloater::removeTypingIndicator(const LLIMInfo* im_info)
 				speaker_mgr->setSpeakerTyping(im_info->mFromID, FALSE);
 			}
 		}
-
 	}
 }
 
@@ -1094,7 +1275,8 @@ void LLIMFloater::closeHiddenIMToasts()
 		}
 	};
 
-	LLNotificationsUI::LLScreenChannel* channel = LLNotificationsUI::LLChannelManager::getNotificationScreenChannel();
+	LLNotificationsUI::LLScreenChannel* channel =
+			LLNotificationsUI::LLChannelManager::getNotificationScreenChannel();
 	if (channel != NULL)
 	{
 		channel->closeHiddenToasts(IMToastMatcher());
@@ -1107,7 +1289,7 @@ void LLIMFloater::confirmLeaveCallCallback(const LLSD& notification, const LLSD&
 	const LLSD& payload = notification["payload"];
 	LLUUID session_id = payload["session_id"];
 
-	LLFloater* im_floater = LLFloaterReg::findInstance("impanel", session_id);
+	LLFloater* im_floater = findInstance(session_id);
 	if (option == 0 && im_floater != NULL)
 	{
 		im_floater->closeFloater();
@@ -1117,79 +1299,44 @@ void LLIMFloater::confirmLeaveCallCallback(const LLSD& notification, const LLSD&
 }
 
 // static
-bool LLIMFloater::isChatMultiTab()
-{
-	// Restart is required in order to change chat window type.
-	static bool is_single_window = gSavedSettings.getS32("ChatWindow") == 1;
-	return is_single_window;
-}
-
-// static
-void LLIMFloater::initIMFloater()
-{
-	// This is called on viewer start up
-	// init chat window type before user changed it in preferences
-	isChatMultiTab();
-}
-
-//static
 void LLIMFloater::sRemoveTypingIndicator(const LLSD& data)
 {
 	LLUUID session_id = data["session_id"];
-	if (session_id.isNull()) return;
+	if (session_id.isNull())
+		return;
 
 	LLUUID from_id = data["from_id"];
-	if (gAgentID == from_id || LLUUID::null == from_id) return;
+	if (gAgentID == from_id || LLUUID::null == from_id)
+		return;
 
 	LLIMFloater* floater = LLIMFloater::findInstance(session_id);
-	if (!floater) return;
+	if (!floater)
+		return;
 
-	if (IM_NOTHING_SPECIAL != floater->mDialog) return;
+	if (IM_NOTHING_SPECIAL != floater->mDialog)
+		return;
 
 	floater->removeTypingIndicator();
 }
 
 void LLIMFloater::onIMChicletCreated( const LLUUID& session_id )
 {
-
-	if (isChatMultiTab())
-	{
-		LLIMFloaterContainer* im_box = LLIMFloaterContainer::getInstance();
-		if (!im_box) return;
-
-		if (LLIMFloater::findInstance(session_id)) return;
-
-		LLIMFloater* new_tab = LLIMFloater::getInstance(session_id);
-
-		im_box->addFloater(new_tab, FALSE, LLTabContainer::END);
-	}
-
+	LLIMFloater::addToHost(session_id);
 }
-
-void	LLIMFloater::onClickCloseBtn()
+void LLIMFloater::addToHost(const LLUUID& session_id)
+	{
+	if (LLIMConversation::isChatMultiTab())
 {
-
-	LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(
-				mSessionID);
-
-	if (session == NULL)
+		LLIMFloaterContainer* im_box = LLIMFloaterContainer::findInstance();
+		if (!im_box)
 	{
-		llwarns << "Empty session." << llendl;
-		return;
+			im_box = LLIMFloaterContainer::getInstance();
 	}
 
-	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())
+		if (im_box && !LLIMFloater::findInstance(session_id))
 	{
-		LLSD payload;
-		payload["session_id"] = mSessionID;
-		LLNotificationsUtil::add("ConfirmLeaveCall", LLSD(), payload, confirmLeaveCallCallback);
-		return;
+			LLIMFloater* new_tab = LLIMFloater::getInstance(session_id);
+			im_box->addFloater(new_tab, FALSE, LLTabContainer::END);
+	}
 	}
-
-	LLFloater::onClickCloseBtn();
 }