From 3422ae3be1634f58dac0051af09dff642180b9ec Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 27 Dec 2022 18:24:06 +0000 Subject: [PATCH] minor cleanup --- .../Framework/Caps/CapabilitiesModule.cs | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index 777ca6062b..937081f8cb 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs @@ -28,7 +28,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using System.Reflection; using System.Text; using log4net; @@ -36,7 +35,6 @@ using Nini.Config; using Mono.Addins; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Region.Framework.Interfaces; @@ -120,16 +118,6 @@ namespace OpenSim.Region.CoreModules.Framework public void CreateCaps(UUID agentId, uint circuitCode) { - int ts = Util.EnvironmentTickCount(); -/* this as no business here... - * must be done elsewhere ( and is ) - int flags = m_scene.GetUserFlags(agentId); - - m_log.ErrorFormat("[CreateCaps]: banCheck {0} ", Util.EnvironmentTickCountSubtract(ts)); - - if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags)) - return; -*/ string capsObjectPath = GetCapsPath(agentId); Caps caps; lock (m_capsObjects) @@ -138,9 +126,9 @@ namespace OpenSim.Region.CoreModules.Framework { if (capsObjectPath == oldCaps.CapsObjectPath) { -// m_log.WarnFormat( -// "[CAPS]: Reusing caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ", -// agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); + //m_log.WarnFormat( + // "[CAPS]: Reusing caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ", + // agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); return; } else @@ -156,21 +144,21 @@ namespace OpenSim.Region.CoreModules.Framework } } -// m_log.DebugFormat( -// "[CAPS]: Adding capabilities for agent {0} in {1} with path {2}", -// agentId, m_scene.RegionInfo.RegionName, capsObjectPath); + //m_log.DebugFormat( + // "[CAPS]: Adding capabilities for agent {0} in {1} with path {2}", + // agentId, m_scene.RegionInfo.RegionName, capsObjectPath); caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, (MainServer.Instance == null) ? 0: MainServer.Instance.Port, capsObjectPath, agentId, m_scene.RegionInfo.RegionName); - m_log.DebugFormat("[CreateCaps]: new caps agent {0}, circuit {1}, path {2}, time {3} ",agentId, - circuitCode,caps.CapsObjectPath, Util.EnvironmentTickCountSubtract(ts)); + m_log.DebugFormat("[CreateCaps]: new caps agent {0}, circuit {1}, path {2}",agentId, + circuitCode,caps.CapsObjectPath); m_capsObjects[circuitCode] = caps; } m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); -// m_log.ErrorFormat("[CreateCaps]: end {0} ", Util.EnvironmentTickCountSubtract(ts)); + //m_log.ErrorFormat("[CreateCaps]: end {0} ", Util.EnvironmentTickCountSubtract(ts)); }