From 66fe32c7caea595eb59cecb6aaa3c5a0d28c8fef Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 27 Mar 2026 23:08:42 +0000 Subject: [PATCH] errr gridhash sent as a uuid; cosmetics --- OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs | 2 +- .../OptionalModules/DataSnapshot/DataSnapshotManager.cs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs b/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs index 932f003238..96b6eeedeb 100644 --- a/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs +++ b/OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs @@ -316,7 +316,7 @@ namespace osWebRtcVoice string channel_id = pRequest.TryGetString("channel_id", out string cli) ? cli : string.Empty; string channel_credentials = pRequest.TryGetString("credentials", out string cred) ? cred : string.Empty; string channel_type = pRequest["channel_type"].AsString(); - string gridHash = pRequest.TryGetString("gridhash", out string ghash) ? ghash : string.Empty; + string gridHash = pRequest.TryGetValue("gridhash", out OSD ghash) ? ghash.AsString() : string.Empty; bool isSpatial = channel_type == "local"; _log.DebugFormat("{0} ProvisionVoiceAccountRequest: parcel_id={1} channel_id={2} channel_type={3} voice_server_type={4}", LogHeader, parcel_local_id, channel_id, channel_type, voice_server_type); diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index 6f9484a029..de77ccd68c 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs @@ -30,7 +30,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Net; using System.Reflection; using System.Threading; using System.Text; @@ -399,10 +398,8 @@ namespace OpenSim.Region.DataSnapshot private void NotifyDataServices(string servicesStr, string serviceName) { Stream reply = null; - string delimStr = ";"; - char [] delimiter = delimStr.ToCharArray(); - string[] services = servicesStr.Split(delimiter, StringSplitOptions.RemoveEmptyEntries); + string[] services = servicesStr.Split([';'], StringSplitOptions.RemoveEmptyEntries); for (int i = 0; i < services.Length; i++) {