From cefcdd445b6bad0e2382d848cd73b20a1a51cc01 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 14 Jan 2013 15:26:59 -0800
Subject: CHUI-458 : WIP : Allow change of the general conversations panel when
 the selected conversation needs it (e.g. P2P is typing)

---
 indra/newview/llfloaterimsession.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llfloaterimsession.h')

diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index 6a2f4b29eb..7239481e56 100644
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -132,6 +132,8 @@ public:
 	static boost::signals2::connection setIMFloaterShowedCallback(const floater_showed_signal_t::slot_type& cb);
 	static floater_showed_signal_t sIMFloaterShowedSignal;
 
+	bool hasSpecialTitle() { return mOtherTyping; }
+	std::string getSpecialTitle() { return getTitle(); }
 private:
 
 	/*virtual*/ void refresh();
-- 
cgit v1.2.3


From 235a3477364c6747d7724a090ca61adbcbeac272 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 15 Jan 2013 14:13:36 -0800
Subject: CHUI-458 : Fixed : Tidy up the title overwrite by the selected
 conversation

---
 indra/newview/llfloaterimsession.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloaterimsession.h')

diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h
index 7239481e56..2049cedfd7 100644
--- a/indra/newview/llfloaterimsession.h
+++ b/indra/newview/llfloaterimsession.h
@@ -132,8 +132,7 @@ public:
 	static boost::signals2::connection setIMFloaterShowedCallback(const floater_showed_signal_t::slot_type& cb);
 	static floater_showed_signal_t sIMFloaterShowedSignal;
 
-	bool hasSpecialTitle() { return mOtherTyping; }
-	std::string getSpecialTitle() { return getTitle(); }
+	bool needsTitleOverwrite() { return mSessionNameUpdatedForTyping && mOtherTyping; }
 private:
 
 	/*virtual*/ void refresh();
@@ -184,6 +183,7 @@ private:
 	bool mShouldSendTypingState;
 	LLFrameTimer mTypingTimer;
 	LLFrameTimer mTypingTimeoutTimer;
+	bool mSessionNameUpdatedForTyping;
 
 	bool mSessionInitialized;
 	LLSD mQueuedMsgsForInit;
-- 
cgit v1.2.3