diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-21 12:02:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-21 12:02:08 -0700 |
| commit | c13eba105f9dcdc4b946e8b5443abf9baf15b691 (patch) | |
| tree | 7658fbce931d80f6580a49a6ee3163a5437aa429 /indra/newview/llvoicevivox.cpp | |
| parent | a9971d35015fc97fb6bd2fb4e94152c9f2e0779e (diff) | |
| parent | e2c7a4d2454eada7d330eef1a57c1788eea775db (diff) | |
Merge pull request #1827 from Ansariel/develop-mergefix
Fix some BOOL oversights during WebRTC merge
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |