From 26a01ced9abb230732ba368241b2ee754d72608a Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Tue, 23 Jul 2024 17:32:59 -0700 Subject: Improve error message notifying user that Voice Morph Effects are not supported secondlife/viewer#1451 --- indra/newview/llvoiceclient.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llvoiceclient.cpp') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 490c7174c5..c20a5ec749 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -37,6 +37,7 @@ #include "llui.h" #include "llkeyboard.h" #include "llagent.h" +#include "lltrans.h" #include "lluiusage.h" const F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f; @@ -597,7 +598,11 @@ bool LLVoiceClient::voiceEnabled() bool enabled = enable_voice_chat && !cmd_line_disable_voice && !gNonInteractive; if (enabled && !mVoiceEffectSupportNotified && getVoiceEffectEnabled() && !getVoiceEffectDefault().isNull()) { - LLNotificationsUtil::add("VoiceEffectsNotSupported", LLSD(), LLSD(), &LLVoiceClient::onVoiceEffectsNotSupported); + static const LLSD args = llsd::map( + "FAQ_URL", LLTrans::getString("no_voice_morphing_faq_url") + ); + + LLNotificationsUtil::add("VoiceEffectsNotSupported", args, LLSD(), &LLVoiceClient::onVoiceEffectsNotSupported); mVoiceEffectSupportNotified = true; } return enabled; -- cgit v1.2.3 From f75735d7416b8217a93ffd3ed95c6289f5ff0c68 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 26 Jul 2024 19:28:40 +0300 Subject: viewer-private#255 p2p outgoing calls did not work correctly #2 --- indra/newview/llvoiceclient.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indra/newview/llvoiceclient.cpp') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index c20a5ec749..0cf4a64c3d 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -826,7 +826,7 @@ void LLVoiceClient::removeObserver(LLVoiceClientParticipantObserver* observer) LLWebRTCVoiceClient::getInstance()->removeObserver(observer); } -std::string LLVoiceClient::sipURIFromID(const LLUUID &id) +std::string LLVoiceClient::sipURIFromID(const LLUUID &id) const { if (mNonSpatialVoiceModule) { @@ -842,6 +842,22 @@ std::string LLVoiceClient::sipURIFromID(const LLUUID &id) } } +LLSD LLVoiceClient::getP2PChannelInfoTemplate(const LLUUID& id) const +{ + if (mNonSpatialVoiceModule) + { + return mNonSpatialVoiceModule->getP2PChannelInfoTemplate(id); + } + else if (mSpatialVoiceModule) + { + return mSpatialVoiceModule->getP2PChannelInfoTemplate(id); + } + else + { + return LLSD(); + } +} + LLVoiceEffectInterface* LLVoiceClient::getVoiceEffectInterface() const { return NULL; -- cgit v1.2.3