diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 17:48:01 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 17:48:01 -0700 |
| commit | 36df0f8a06629c5a14358c07d0f12ce1019f066e (patch) | |
| tree | 7cf7bbbaeb351b84888032ff98627b04fd871b60 /indra/newview/llimconversation.h | |
| parent | 3d5e24d135bd5d2636f075f9ef12ffba2129c61f (diff) | |
| parent | 046e90a8f74f3c13107a7edc72e912799a5e62e9 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llimconversation.h')
| -rw-r--r-- | indra/newview/llimconversation.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimconversation.h b/indra/newview/llimconversation.h index e09ba79a6a..c54081d316 100644 --- a/indra/newview/llimconversation.h +++ b/indra/newview/llimconversation.h @@ -47,7 +47,7 @@ class LLIMConversation public: LOG_CLASS(LLIMConversation); - LLIMConversation(const LLUUID& session_id); + LLIMConversation(const LLSD& session_id); ~LLIMConversation(); // reload all message with new settings of visual modes @@ -140,8 +140,8 @@ private: LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called. + bool mHadFocus; bool mHasFocus; - bool mHaveFocus; }; |