summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicechannel.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llvoicechannel.h')
-rw-r--r--indra/newview/llvoicechannel.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index e68bfbe1ff..5b15acd8cd 100644
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -76,8 +76,8 @@ public:
const std::string& uri,
const std::string& credentials);
virtual void getChannelInfo();
- virtual BOOL isActive();
- virtual BOOL callStarted();
+ virtual bool isActive();
+ virtual bool callStarted();
// Session name is a UI label used for feedback about which person,
// group, or phone number you are talking to
@@ -124,7 +124,7 @@ protected:
LLSD mCallDialogPayload;
// true if call was ended by agent
bool mCallEndedByAgent;
- BOOL mIgnoreNextSessionLeave;
+ bool mIgnoreNextSessionLeave;
LLHandle<LLPanel> mLoginNotificationHandle;
typedef std::map<LLUUID, LLVoiceChannel*> voice_channel_map_t;
@@ -135,7 +135,7 @@ protected:
static LLVoiceChannel* sCurrentVoiceChannel;
static LLVoiceChannel* sSuspendedVoiceChannel;
- static BOOL sSuspended;
+ static bool sSuspended;
private:
state_changed_signal_t mStateChangedCallback;
@@ -162,7 +162,7 @@ private:
void voiceCallCapCoro(std::string url);
U32 mRetries;
- BOOL mIsRetrying;
+ bool mIsRetrying;
};
class LLVoiceChannelProximal : public LLVoiceChannel, public LLSingleton<LLVoiceChannelProximal>
@@ -173,7 +173,7 @@ public:
/*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal) override;
/*virtual*/ void handleStatusChange(EStatusType status) override;
/*virtual*/ void handleError(EStatusType status) override;
- /*virtual*/ BOOL isActive() override;
+ /*virtual*/ bool isActive() override;
/*virtual*/ void activate() override;
/*virtual*/ void deactivate() override;
@@ -204,7 +204,7 @@ private:
std::string mSessionHandle;
LLUUID mOtherUserID;
- BOOL mReceivedCall;
+ bool mReceivedCall;
};
#endif // LL_VOICECHANNEL_H