diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-10-22 18:17:47 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-10-22 18:17:47 +0000 |
| commit | 94bcd2c47d7ba25693ae582e71e028142d3bc13b (patch) | |
| tree | 058dd54f0085351cc9ffc35901efb1a221a56745 /indra/newview/llimpanel.h | |
| parent | aa8b0cbe690eef9ed4fb7f6f9e8cc75a0a073d76 (diff) | |
svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code.
Diffstat (limited to 'indra/newview/llimpanel.h')
| -rw-r--r-- | indra/newview/llimpanel.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index 631dc5cca1..c1ad18dd3c 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -62,13 +62,15 @@ public: LLVoiceChannel(const LLUUID& session_id, const LLString& session_name); virtual ~LLVoiceChannel(); - void setChannelInfo(const LLString& uri, const LLString& credentials); /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); virtual void handleStatusChange(EStatusType status); virtual void handleError(EStatusType status); virtual void deactivate(); virtual void activate(); + virtual void setChannelInfo( + const LLString& uri, + const LLString& credentials); virtual void getChannelInfo(); virtual BOOL isActive(); virtual BOOL callStarted(); @@ -82,7 +84,7 @@ public: static void initClass(); protected: - void setState(EState state); + virtual void setState(EState state); void setURI(LLString uri); LLString mURI; @@ -109,10 +111,21 @@ public: LLVoiceChannelGroup(const LLUUID& session_id, const LLString& session_name); virtual ~LLVoiceChannelGroup(); + /*virtual*/ void handleStatusChange(EStatusType status); /*virtual*/ void handleError(EStatusType status); /*virtual*/ void activate(); /*virtual*/ void deactivate(); + /*vritual*/ void setChannelInfo( + const LLString& uri, + const LLString& credentials); /*virtual*/ void getChannelInfo(); + +protected: + virtual void setState(EState state); + +private: + U32 mRetries; + BOOL mIsRetrying; }; class LLVoiceChannelProximal : public LLVoiceChannel, public LLSingleton<LLVoiceChannelProximal> |