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

fixup tabs

master
Roxie Linden 2024-03-11 14:41:12 -07:00
parent d67a3022d3
commit 1f177d837c
13 changed files with 350 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/message.xml
View File

@ -513,7 +513,6 @@
<key>trusted-sender</key>
<boolean>false</boolean>
</map>
<!-- Server to client -->
<key>RequiredVoiceVersion</key>
<map>

5
indra/newview/llimview.cpp
View File

@ -2368,6 +2368,7 @@ void LLCallDialogManager::onVoiceChannelStateChangedInt(const LLVoiceChannel::ES
return;
}
break;
case LLVoiceChannel::STATE_NO_CHANNEL_INFO :
// This will happen in p2p calls using the adhoc
// infrastructure, which marks the channel as no channel info
@ -3261,7 +3262,7 @@ LLUUID LLIMMgr::addP2PSession(const std::string& name,
const LLUUID& other_participant_id,
const LLSD& voice_channel_info)
{
LL_WARNS("Voice") << "ADD P2P VOICE CHANNEL INFO: " << voice_channel_info << LL_ENDL;
LL_DEBUGS("Voice") << "Add p2p voice channel info: " << voice_channel_info << LL_ENDL;
return addSession(name, IM_NOTHING_SPECIAL, other_participant_id, voice_channel_info);
}
@ -4126,7 +4127,7 @@ public:
}
BOOL session_type_p2p = input["body"]["voice"].get("invitation_type").asInteger() == EMultiAgentChatSessionType::P2P_CHAT_SESSION;
LL_WARNS("Voice") << "VOICE DATA: " << input["body"]<< LL_ENDL;
LL_DEBUGS("Voice") << "Received P2P voice information from the server: " << input["body"]<< LL_ENDL;
gIMMgr->inviteToSession(
input["body"]["session_id"].asUUID(),
input["body"]["session_name"].asString(),

4
indra/newview/llvieweraudio.cpp
View File

@ -480,11 +480,11 @@ void audio_update_volume(bool force_update)
if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized")))
{
//voice_inst->setMuteMic(true);
voice_inst->setMuteMic(true);
}
else
{
//voice_inst->setMuteMic(false);
voice_inst->setMuteMic(false);
}
}
}

4
indra/newview/llvoicechannel.cpp
View File

@ -120,8 +120,8 @@ void LLVoiceChannel::setChannelInfo(const LLSD &channelInfo)
void LLVoiceChannel::onChange(EStatusType type, const LLSD& channelInfo, bool proximal)
{
LL_WARNS("Voice") << channelInfo << LL_ENDL;
LL_WARNS("Voice") << mChannelInfo << LL_ENDL;
LL_DEBUGS("Voice") << "Incoming channel info: " << channelInfo << LL_ENDL;
LL_DEBUGS("Voice") << "Current channel info: " << mChannelInfo << LL_ENDL;
if (mChannelInfo.isUndefined())
{
mChannelInfo = channelInfo;

3
indra/newview/llvoiceclient.cpp
View File

@ -303,7 +303,6 @@ void LLVoiceClient::tuningStop()
{
LLWebRTCVoiceClient::getInstance()->tuningStop();
LLVivoxVoiceClient::getInstance()->tuningStop();
}
bool LLVoiceClient::inTuningMode()
@ -784,8 +783,6 @@ class LLViewerRequiredVoiceVersion : public LLHTTPNode
const LLSD& context,
const LLSD& input) const
{
std::string voice_server_type = "vivox";
if (input.has("body") && input["body"].has("voice_server_type"))
{