From 79135494d36d6564f0b9356473aca4d93915e178 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 7 Oct 2022 17:28:29 +0100 Subject: [PATCH] cosmetics --- .../Caps/EventQueue/EventQueueGetHandlers.cs | 12 ++++------ .../Caps/EventQueue/EventQueueGetModule.cs | 22 ++++++++----------- .../Region/Framework/Scenes/EntityUpdates.cs | 2 +- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetHandlers.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetHandlers.cs index 8ca35f5abc..11a4e83c7a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetHandlers.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetHandlers.cs @@ -84,8 +84,7 @@ namespace OpenSim.Region.ClientStack.Linden public virtual void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY) { if (DebugLevel > 0) - m_log.DebugFormat("{0} EnableSimulator. handle={1}, endPoint={2}, avatarID={3}", - LogHeader, handle, endPoint, avatarID, regionSizeX, regionSizeY); + m_log.Debug($"{LogHeader} EnableSimulator. handle={handle}, endPoint={endPoint}, avatarID={avatarID}"); osUTF8 sb = StartEvent("EnableSimulator"); LLSDxmlEncode2.AddArrayAndMap("SimulatorInfo", sb); @@ -103,8 +102,7 @@ namespace OpenSim.Region.ClientStack.Linden ulong regionHandle, int regionSizeX, int regionSizeY) { if (DebugLevel > 0) - m_log.DebugFormat("{0} EstablishAgentCommunication. handle={1}, endPoint={2}, avatarID={3}", - LogHeader, regionHandle, endPoint, avatarID, regionSizeX, regionSizeY); + m_log.Debug($"{LogHeader} EstablishAgentCommunication. handle={regionHandle}, endPoint={endPoint}, avatarID={avatarID}"); osUTF8 sb = StartEvent("EstablishAgentCommunication"); @@ -125,8 +123,7 @@ namespace OpenSim.Region.ClientStack.Linden UUID avatarID, int regionSizeX, int regionSizeY) { if (DebugLevel > 0) - m_log.DebugFormat("{0} TeleportFinishEvent. handle={1}, endPoint={2}, avatarID={3}", - LogHeader, regionHandle, regionExternalEndPoint, avatarID, regionSizeX, regionSizeY); + m_log.Debug($"{LogHeader} TeleportFinishEvent. handle={regionHandle}, endPoint={regionExternalEndPoint}, avatarID={avatarID}"); // not sure why flags get overwritten here if ((flags & (uint)TeleportFlags.IsFlying) != 0) @@ -157,8 +154,7 @@ namespace OpenSim.Region.ClientStack.Linden string capsURL, UUID avatarID, UUID sessionID, int regionSizeX, int regionSizeY) { if (DebugLevel > 0) - m_log.DebugFormat("{0} CrossRegion. handle={1}, avatarID={2}, regionSize={3},{4}>", - LogHeader, handle, avatarID, regionSizeX, regionSizeY); + m_log.Debug($"{LogHeader} CrossRegion. handle={handle}, avatarID={avatarID}, regionSize={regionSizeX},{regionSizeY}>"); osUTF8 sb = StartEvent("CrossedRegion"); diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 6ef07f3619..02e7f63397 100755 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs @@ -30,6 +30,7 @@ using System.Collections; using System.Collections.Generic; using System.Net; using System.Reflection; +using System.Runtime.CompilerServices; using System.Text; using log4net; using Nini.Config; @@ -50,7 +51,7 @@ namespace OpenSim.Region.ClientStack.Linden public OSDMap body; } - [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EventQueueGetModule")] + [Mono.Addins.Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EventQueueGetModule")] public partial class EventQueueGetModule : IEventQueue, INonSharedRegionModule { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -147,20 +148,19 @@ namespace OpenSim.Region.ClientStack.Linden else { DebugLevel = debugLevel; - MainConsole.Instance.Output( - "Set event queue debug level to {0} in {1}", DebugLevel, m_scene.RegionInfo.RegionName); + MainConsole.Instance.Output($"Set event queue debug level to {DebugLevel} in {m_scene.RegionInfo.RegionName}"); } } protected void HandleShowEq(string module, string[] args) { - MainConsole.Instance.Output("Events in Scene {0} agents queues :", m_scene.Name); + MainConsole.Instance.Output($"Events in Scene {m_scene.Name} agents queues :"); lock (queues) { foreach (KeyValuePair> kvp in queues) { - MainConsole.Instance.Output(" {0} {1}", kvp.Key, kvp.Value.Count); + MainConsole.Instance.Output($" {kvp.Key} {kvp.Value.Count}"); } } } @@ -221,14 +221,12 @@ namespace OpenSim.Region.ClientStack.Linden } else { - m_log.WarnFormat( - "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} in region {1}", - avatarID, m_scene.Name); + m_log.Warn($"[EVENTQUEUE]: (Enqueue) No queue found for agent {avatarID} in region {m_scene.Name}"); } } catch (NullReferenceException e) { - m_log.Error("[EVENTQUEUE] Caught exception: " + e); + m_log.Error($"[EVENTQUEUE] Caught exception: {e.Message}"); return false; } return true; @@ -457,9 +455,7 @@ namespace OpenSim.Region.ClientStack.Linden if (element is OSDMap) { OSDMap ev = (OSDMap)element; - m_log.DebugFormat( - "Eq OUT {0,-30} to {1,-20} {2,-20}", - ev["message"], m_scene.GetScenePresence(agentId).Name, m_scene.Name); + m_log.Debug($"Eq OUT {ev["message"],-30} to {m_scene.GetScenePresence(agentId).Name,-20} {m_scene.Name,-20}"); } } @@ -473,7 +469,7 @@ namespace OpenSim.Region.ClientStack.Linden public Hashtable GetEvents(UUID requestID, UUID pAgentId) { if (DebugLevel >= 2) - m_log.WarnFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.Name); + m_log.Warn($"POLLED FOR EQ MESSAGES BY {pAgentId} in {m_scene.Name}"); Queue queue = GetQueue(pAgentId); if (queue == null) diff --git a/OpenSim/Region/Framework/Scenes/EntityUpdates.cs b/OpenSim/Region/Framework/Scenes/EntityUpdates.cs index 64f2dbf916..ec111de100 100644 --- a/OpenSim/Region/Framework/Scenes/EntityUpdates.cs +++ b/OpenSim/Region/Framework/Scenes/EntityUpdates.cs @@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Scenes if ((newFlags & PrimUpdateFlags.UpdateProbe) != 0) m_flags = PrimUpdateFlags.UpdateProbe; else - newFlags = PrimUpdateFlags.FullUpdatewithAnim; + m_flags = PrimUpdateFlags.FullUpdatewithAnim; } else m_flags |= newFlags;