summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-15 14:13:36 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-15 14:13:36 -0800
commit235a3477364c6747d7724a090ca61adbcbeac272 (patch)
tree1fc384c5640285742d7b05bf9a668b7e793cf90d /indra/newview/llfloaterimsession.h
parentcefcdd445b6bad0e2382d848cd73b20a1a51cc01 (diff)
CHUI-458 : Fixed : Tidy up the title overwrite by the selected conversation
Diffstat (limited to 'indra/newview/llfloaterimsession.h')
-rw-r--r--indra/newview/llfloaterimsession.h4
1 files changed, 2 insertions, 2 deletions
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;