ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

errr gridhash sent as a uuid; cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2026-03-27 23:08:42 +00:00
parent f83ec8bebd
commit 66fe32c7ca
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Addons/os-webrtc-janus/Janus/WebRtcJanusService.cs
View File

@@ -316,7 +316,7 @@ namespace osWebRtcVoice
string channel_id = pRequest.TryGetString("channel_id", out string cli) ? cli : string.Empty; 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_credentials = pRequest.TryGetString("credentials", out string cred) ? cred : string.Empty;
string channel_type = pRequest["channel_type"].AsString(); 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"; 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); _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);

5
OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs
View File

@@ -30,7 +30,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Text; using System.Text;
@@ -399,10 +398,8 @@ namespace OpenSim.Region.DataSnapshot
private void NotifyDataServices(string servicesStr, string serviceName) private void NotifyDataServices(string servicesStr, string serviceName)
{ {
Stream reply = null; 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++) for (int i = 0; i < services.Length; i++)
{ {