diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-15 20:37:54 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-15 20:37:54 -0800 |
| commit | 41a53e864924cdb192aad9b3906006d7e8d4c91e (patch) | |
| tree | 1b3d61897aa6b5be23254f17a82dfdc55b22397b /indra/newview/llfloaterimsession.h | |
| parent | de9e2c38126682e5c6215151e3389380a93b8bc0 (diff) | |
| parent | fd0cae39f38673d69448e90971e2369e0b81c2fe (diff) | |
merging changes
Diffstat (limited to 'indra/newview/llfloaterimsession.h')
| -rw-r--r-- | indra/newview/llfloaterimsession.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h index 6a2f4b29eb..2049cedfd7 100644 --- a/indra/newview/llfloaterimsession.h +++ b/indra/newview/llfloaterimsession.h @@ -132,6 +132,7 @@ public: static boost::signals2::connection setIMFloaterShowedCallback(const floater_showed_signal_t::slot_type& cb); static floater_showed_signal_t sIMFloaterShowedSignal; + bool needsTitleOverwrite() { return mSessionNameUpdatedForTyping && mOtherTyping; } private: /*virtual*/ void refresh(); @@ -182,6 +183,7 @@ private: bool mShouldSendTypingState; LLFrameTimer mTypingTimer; LLFrameTimer mTypingTimeoutTimer; + bool mSessionNameUpdatedForTyping; bool mSessionInitialized; LLSD mQueuedMsgsForInit; |