summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicewebrtc.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2024-04-21 21:12:06 -0700
committerRoxie Linden <roxie@lindenlab.com>2024-04-21 21:12:06 -0700
commit98322d5f070b260f1e46eb5d9fcd54fa43151329 (patch)
tree45cb5b6dcdfd6d458c87951c794f269b96bcce0d /indra/newview/llvoicewebrtc.h
parent07d7779d87552133e98df835bfdcb0a1fb5b10ca (diff)
Reconnect when parcel voice params change.
When parcel voice permissions and region/parcel-only voice settings change, a callback will be made to the viewer with new voice credential information. For webrtc, this means either just the uuid of the voice channel, or nothing if voice is disabled. This change looks at that callback and the channel id, and sets the appropriate flags on the parcel/region as needed which will cause voice to be renegotiated. Also, there was a race condition if the voice connect attempt was made before caps were retrieved, which would have resulted in full renegotiate attempts. Now, just wait until the cap comes in and continue.
Diffstat (limited to 'indra/newview/llvoicewebrtc.h')
-rw-r--r--indra/newview/llvoicewebrtc.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h
index aa3298ec1b..67e4a4ea6f 100644
--- a/indra/newview/llvoicewebrtc.h
+++ b/indra/newview/llvoicewebrtc.h
@@ -144,12 +144,7 @@ public:
startAdHocSession(channelInfo, notify_on_first_join, hangup_on_last_leave);
}
- bool setSpatialChannel(const LLSD &channelInfo) override
- {
- // we don't really have credentials for a spatial channel in webrtc,
- // it's all handled by the sim.
- return true;
- }
+ bool setSpatialChannel(const LLSD &channelInfo) override;
void leaveNonSpatialChannel() override;