livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some BOOL oversights during WebRTC merge

master
Ansariel 2024-06-21 19:48:18 +02:00
parent 9fb9e8f33c
commit e2c7a4d245
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llimview.cpp
View File

@ -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(),

4
indra/newview/llvoicechannel.cpp
View File

@ -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);

2
indra/newview/llvoiceclient.h
View File

@ -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);

6
indra/newview/llvoicevivox.cpp
View File

@ -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)
{

2
indra/newview/llvoicewebrtc.cpp
View File

@ -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