Merge pull request #1827 from Ansariel/develop-mergefix

Fix some BOOL oversights during WebRTC merge

5 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 9df8807bf5..72edbaebe1 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -4267,7 +4267,7 @@ public:
                 return;
             }
 
-            BOOL session_type_p2p = input["body"]["voice"].get("invitation_type").asInteger() == EMultiAgentChatSessionType::P2P_CHAT_SESSION;
+            bool session_type_p2p = input["body"]["voice"].get("invitation_type").asInteger() == EMultiAgentChatSessionType::P2P_CHAT_SESSION;
             LL_DEBUGS("Voice") << "Received voice information from the server: " << input["body"]<< LL_ENDL;
             gIMMgr->inviteToSession(
                 input["body"]["session_id"].asUUID(),
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index dedc4efcb9..b665eb69a2 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -887,7 +887,7 @@ void LLVoiceChannelP2P::requestChannelInfo()
 void LLVoiceChannelP2P::setChannelInfo(const LLSD& channel_info)
 {
     mChannelInfo        = channel_info;
-    BOOL needs_activate = false;
+    bool needs_activate = false;
     if (callStarted())
     {
         // defer to lower agent id when already active
@@ -906,7 +906,7 @@ void LLVoiceChannelP2P::setChannelInfo(const LLSD& channel_info)
         }
     }
 
-    mReceivedCall = TRUE;
+    mReceivedCall = true;
     if (!channel_info.isUndefined())
     {
         mIncomingCallInterface = LLVoiceClient::getInstance()->getIncomingCallInterface(channel_info);
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 0317899675..7411df1693 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -470,7 +470,7 @@ public:
     //@{
     bool isSessionTextIMPossible(const LLUUID& id);
     bool isSessionCallBackPossible(const LLUUID& id);
-    //BOOL sendTextMessage(const LLUUID& participant_id, const std::string& message) const {return true;} ;
+    //bool sendTextMessage(const LLUUID& participant_id, const std::string& message) const {return true;} ;
     //@}
 
     void setSpatialVoiceModule(const std::string& voice_server_type);
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 5f8da2ff83..17fd85f280 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1924,7 +1924,7 @@ bool LLVivoxVoiceClient::terminateAudioSession(bool wait)
                        << " VoiceEnabled " << mVoiceEnabled
                        << " IsInitialized " << mIsInitialized
                        << " RelogRequested " << mRelogRequested
-                       << " ShuttingDown " << (sShuttingDown ? "TRUE" : "FALSE")
+                       << " ShuttingDown " << (sShuttingDown ? "True" : "False")
                        << " returning " << status
                        << LL_ENDL;
     return status;
@@ -5186,7 +5186,7 @@ std::string LLVivoxVoiceClient::nameFromID(const LLUUID &uuid)
     LLStringUtil::replaceChar(result, '+', '-');
     LLStringUtil::replaceChar(result, '/', '_');
 
-    // If you need to transform a GUID to this form on the Mac OS X command line, this will do so:
+    // If you need to transform a GUID to this form on the macOS command line, this will do so:
     // echo -n x && (echo e669132a-6c43-4ee1-a78d-6c82fff59f32 |xxd -r -p |openssl base64|tr '/+' '_-')
 
     // The reverse transform can be done with:
@@ -6919,7 +6919,7 @@ void LLVivoxVoiceClient::updateVoiceMorphingMenu()
             const voice_effect_list_t& effect_list = effect_interfacep->getVoiceEffectList();
             if (!effect_list.empty())
             {
-                LLMenuGL * voice_morphing_menup = gMenuBarView->findChildMenuByName("VoiceMorphing", TRUE);
+                LLMenuGL * voice_morphing_menup = gMenuBarView->findChildMenuByName("VoiceMorphing", true);
 
                 if (NULL != voice_morphing_menup)
                 {
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 50299bd6cb..661b4f7ef1 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -1294,7 +1294,7 @@ bool LLWebRTCVoiceClient::isVoiceWorking() const
 bool LLWebRTCVoiceClient::isSessionCallBackPossible(const LLUUID &session_id)
 {
     sessionStatePtr_t session(findP2PSession(session_id));
-    return session && session->isCallbackPossible() ? true : false;
+    return session && session->isCallbackPossible();
 }
 
 // Channel Management