diff options
| author | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
|---|---|---|
| committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
| commit | 328f64b4b9b870661a6d0bb8947dc1ff410ca0f8 (patch) | |
| tree | 769bd24c2300307846e316e230db5dadb641611a /indra/newview/llfloaterimsession.h | |
| parent | 061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc (diff) | |
| parent | 1ad94b5a9a8d0b6d095938148cbf8b1b56a778bf (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterimsession.h')
| -rwxr-xr-x | indra/newview/llfloaterimsession.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h index d6718843ca..2b9d06e744 100755 --- a/indra/newview/llfloaterimsession.h +++ b/indra/newview/llfloaterimsession.h @@ -187,6 +187,8 @@ private: LLFrameTimer mTypingTimer; LLFrameTimer mTypingTimeoutTimer; bool mSessionNameUpdatedForTyping; + LLFrameTimer mMeTypingTimer; + LLFrameTimer mOtherTypingTimer; bool mSessionInitialized; LLSD mQueuedMsgsForInit; @@ -196,6 +198,8 @@ private: // connection to voice channel state change signal boost::signals2::connection mVoiceChannelStateChangeConnection; + + const LLIMInfo* mImInfo; }; #endif // LL_FLOATERIMSESSION_H |