Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index eb16cc22ba..6af1bd57a3 100644
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -74,8 +74,8 @@ public:
     virtual void activate();
     virtual void setChannelInfo(const LLSD &channelInfo);
     virtual void requestChannelInfo();
-    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
@@ -120,7 +120,7 @@ public:
     LLSD        mChannelInfo;
     // 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;
@@ -129,7 +129,7 @@ public:
     static LLVoiceChannel* sProximalVoiceChannel;
     static LLVoiceChannel* sCurrentVoiceChannel;
     static LLVoiceChannel* sSuspendedVoiceChannel;
-    static BOOL sSuspended;
+    static bool sSuspended;
 
 private:
     state_changed_signal_t mStateChangedCallback;
@@ -158,19 +158,19 @@ private:
     void voiceCallCapCoro(std::string url);
 
     U32 mRetries;
-    BOOL mIsRetrying;
+    bool mIsRetrying;
     bool mIsP2P;
 };
 
 class LLVoiceChannelProximal : public LLVoiceChannel, public LLSingleton<LLVoiceChannelProximal>
 {
-    LLSINGLETON_C11(LLVoiceChannelProximal);
+    LLSINGLETON(LLVoiceChannelProximal);
   public:
 
     void onChange(EStatusType status, const LLSD &channelInfo, bool proximal) override;
     void handleStatusChange(EStatusType status) override;
     void handleError(EStatusType status) override;
-    BOOL isActive() override;
+    bool isActive() override;
     void activate() override;
     void deactivate() override;
 };
@@ -201,7 +201,7 @@ private:
     **/
     void addToTheRecentPeopleList();
     LLUUID      mOtherUserID;
-    BOOL        mReceivedCall;
+    bool        mReceivedCall;
     LLVoiceP2POutgoingCallInterface *mOutgoingCallInterface;
     LLVoiceP2PIncomingCallInterfacePtr mIncomingCallInterface;
 };