diff options
| author | Roxanne Skelly <roxanne@roxiware.com> | 2024-09-18 19:13:49 -0700 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 19:13:49 -0700 | 
| commit | a36cf18bab5eb45e8784502f0d8ba47d20d952c8 (patch) | |
| tree | 28d4e04fd147266dcc6852f93825f15c4f2429a5 /indra | |
| parent | ecfd66fb094cf46a73c164d8a1b655489d037aec (diff) | |
| parent | 743a1a6d8eabf069d95777c96e5b657cb8702593 (diff) | |
Merge pull request #2602 from secondlife/roxie/webrtc-2601
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoicewebrtc.cpp | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index 3d684e5a1b..ad8f6927ed 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -87,6 +87,8 @@ namespace {      const F32 SPEAKING_AUDIO_LEVEL = 0.30; +    const uint32_t PEER_GAIN_CONVERSION_FACTOR = 220; +      static const std::string REPORTED_VOICE_SERVER_TYPE = "Secondlife WebRTC Gateway";      // Don't send positional updates more frequently than this: @@ -2443,7 +2445,7 @@ void LLVoiceWebRTCConnection::setSpeakerVolume(F32 volume)  void LLVoiceWebRTCConnection::setUserVolume(const LLUUID& id, F32 volume)  { -    boost::json::object root = {{"ug", {id.asString(), (uint32_t) (volume * 200)}}}; +    boost::json::object root      = { { "ug", { { id.asString(), (uint32_t)(volume * PEER_GAIN_CONVERSION_FACTOR) } } } };      std::string json_data = boost::json::serialize(root);      if (mWebRTCDataInterface)      { @@ -2453,7 +2455,7 @@ void LLVoiceWebRTCConnection::setUserVolume(const LLUUID& id, F32 volume)  void LLVoiceWebRTCConnection::setUserMute(const LLUUID& id, bool mute)  { -    boost::json::object root = {{"m", {id.asString(), mute}}}; +    boost::json::object root      = { { "m", { { id.asString(), mute } } } };      std::string         json_data = boost::json::serialize(root);      if (mWebRTCDataInterface)      { | 
