diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-03-10 14:04:36 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-03-10 14:04:36 +0200 |
| commit | 9757cd64e19209484333ff8d07aa86fcccaf22f6 (patch) | |
| tree | 337b989b0de423f1bb606b0ebfa08c9db5045c07 /indra/newview/llimview.h | |
| parent | 1eff2a33b1fab8ebe757ce30b36dc71df5b58cb9 (diff) | |
fixed EXT-4872 'Loading...' message remains in ad-hoc IM floated opened by 'Start IM' button
added timing out of session initialization (after 30 seconds)
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index ad6cede727..8e53edaab0 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -34,6 +34,7 @@ #define LL_LLIMVIEW_H #include "lldockablefloater.h" +#include "lleventtimer.h" #include "llinstantmessage.h" #include "lllogchat.h" @@ -45,7 +46,24 @@ class LLFriendObserver; class LLCallDialogManager; class LLIMSpeakerMgr; +/** + * Timeout Timer for outgoing Ad-Hoc/Group IM sessions which being initialized by the server + */ +class LLSessionTimeoutTimer : public LLEventTimer +{ +public: + LLSessionTimeoutTimer(const LLUUID& session_id, F32 period) : LLEventTimer(period), mSessionId(session_id) {} + virtual ~LLSessionTimeoutTimer() {}; + /* virtual */ BOOL tick(); + +private: + LLUUID mSessionId; +}; + +/** + * Model (MVC) for IM Sessions + */ class LLIMModel : public LLSingleton<LLIMModel> { public: |