diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs index 2002cfcefb..72d40e485e 100644 --- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs +++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/VoiceViewerSession.cs @@ -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; } diff --git a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs index b86de5a8cf..3fa1b0d3be 100644 --- a/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs +++ b/OpenSim/Addons/os-webrtc-janus/WebRtcVoice/WebRtcVoiceServiceConnector.cs @@ -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 }, diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 37a064fca6..2865e3be35 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs @@ -60,6 +60,7 @@ namespace OpenSim.Framework /// The name of this scene. /// string Name { get; } + UUID ID { get; } RegionInfo RegionInfo { get; } RegionStatus RegionStatus { get; set; } diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 46df46b8be..8857b625bc 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs @@ -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 /// public Dictionary RegionModules { + [MethodImpl(MethodImplOptions.AggressiveInlining)] get { return m_regionModules; } } - private Dictionary m_regionModules = new Dictionary(); + private Dictionary m_regionModules = []; /// /// The module interfaces available from this scene. /// - protected Dictionary> ModuleInterfaces = new Dictionary>(); + protected Dictionary> ModuleInterfaces = []; /// /// These two objects hold the information about any formats used /// by modules that hold agent specific data. /// protected List FormatsOffered = new List(); - protected Dictionary> FormatsWanted = new Dictionary>(); + protected Dictionary> FormatsWanted = []; - protected Dictionary ModuleAPIMethods = new Dictionary(); + protected Dictionary ModuleAPIMethods = []; /// /// The module commanders available from this scene /// - protected Dictionary m_moduleCommanders = new Dictionary(); + protected Dictionary m_moduleCommanders = []; /// /// Registered classes that are capable of creating entities. /// - protected Dictionary m_entityCreators = new Dictionary(); + protected Dictionary m_entityCreators = []; /// /// 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;