ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

add scene.ID alias to scene.regioninfo.regionID plus cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2026-03-26 00:22:40 +00:00
parent d34a926f81
commit 73fb61d02b
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs
View File

@@ -35,7 +35,6 @@ namespace osWebRtcVoice
{
public class VoiceViewerSession : IVoiceViewerSession
{
// A simple session structure that is used when the connection is actually in the
// remote service.
public VoiceViewerSession(IWebRtcVoiceService pVoiceService, UUID pRegionId, UUID pAgentId)
@@ -44,7 +43,6 @@ namespace osWebRtcVoice
AgentId = pAgentId;
ViewerSessionID = UUID.Random().ToString();
VoiceService = pVoiceService;
}
public string ViewerSessionID { get; set; }
public IWebRtcVoiceService VoiceService { get; set; }

2
OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs
View File

@@ -93,7 +93,7 @@ namespace osWebRtcVoice
// Received a ProvisionVoiceAccountRequest from a viewer. Forward it to the WebRTC service.
public OSDMap ProvisionVoiceAccountRequest(IVoiceViewerSession pVSession, OSDMap pRequest, UUID pUserID, UUID pSceneID)
{
m_log.Debug($"{LogHeader} VoiceSignalingRequest. uID={pUserID}, sID={pSceneID}");
m_log.Debug($"{LogHeader} ProvisionVoiceAccountRequest. uID={pUserID}, sID={pSceneID}");
OSDMap req = new()
{
{ "request", pRequest },

1
OpenSim/Framework/IScene.cs
View File

@@ -60,6 +60,7 @@ namespace OpenSim.Framework
/// The name of this scene.
/// </summary>
string Name { get; }
UUID ID { get; }
RegionInfo RegionInfo { get; }
RegionStatus RegionStatus { get; set; }

32
OpenSim/Region/Framework/Scenes/SceneBase.cs
View File

@@ -28,12 +28,12 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Threading;
using OpenMetaverse;
using log4net;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Framework.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
@@ -56,10 +56,21 @@ namespace OpenSim.Region.Framework.Scenes
#region Fields
public string Name { get { return RegionInfo.RegionName; } }
public string Name
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return RegionInfo.RegionName; }
}
public UUID ID
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return RegionInfo.RegionID; }
}
public IConfigSource Config
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return GetConfig(); }
}
@@ -73,33 +84,34 @@ namespace OpenSim.Region.Framework.Scenes
/// </value>
public Dictionary<string, IRegionModuleBase> RegionModules
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return m_regionModules; }
}
private Dictionary<string, IRegionModuleBase> m_regionModules = new Dictionary<string, IRegionModuleBase>();
private Dictionary<string, IRegionModuleBase> m_regionModules = [];
/// <value>
/// The module interfaces available from this scene.
/// </value>
protected Dictionary<Type, List<object>> ModuleInterfaces = new Dictionary<Type, List<object>>();
protected Dictionary<Type, List<object>> ModuleInterfaces = [];
/// <summary>
/// These two objects hold the information about any formats used
/// by modules that hold agent specific data.
/// </summary>
protected List<UUID> FormatsOffered = new List<UUID>();
protected Dictionary<object, List<UUID>> FormatsWanted = new Dictionary<object, List<UUID>>();
protected Dictionary<object, List<UUID>> FormatsWanted = [];
protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>();
protected Dictionary<string, object> ModuleAPIMethods = [];
/// <value>
/// The module commanders available from this scene
/// </value>
protected Dictionary<string, ICommander> m_moduleCommanders = new Dictionary<string, ICommander>();
protected Dictionary<string, ICommander> m_moduleCommanders = [];
/// <value>
/// Registered classes that are capable of creating entities.
/// </value>
protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>();
protected Dictionary<PCode, IEntityCreator> m_entityCreators = [];
/// <summary>
/// The last allocated local prim id. When a new local id is requested, the next number in the sequence is
@@ -108,10 +120,11 @@ namespace OpenSim.Region.Framework.Scenes
protected int m_lastAllocatedLocalId = 720000;
protected int m_lastAllocatedIntId = 7200;
protected readonly ClientManager m_clientManager = new ClientManager();
protected readonly ClientManager m_clientManager = new();
public bool LoginsEnabled
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get
{
return m_loginsEnabled;
@@ -130,6 +143,7 @@ namespace OpenSim.Region.Framework.Scenes
public bool Ready
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get
{
return m_ready;