From 57e8cac8cb38b2c3d89d11e8803c2d1c55dfe2d8 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 7 Feb 2022 20:11:09 +0000 Subject: [PATCH] cosmetics --- .../CoreModules/World/Estate/EstateModule.cs | 30 ++++++++----------- .../World/Estate/EstateRequestHandler.cs | 4 +-- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs index ca6235e992..890556c396 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs @@ -44,7 +44,7 @@ using Mono.Addins; namespace OpenSim.Region.CoreModules.World.Estate { - [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")] + [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EstateModule")] public class EstateModule : ISharedRegionModule { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); @@ -150,7 +150,7 @@ namespace OpenSim.Region.CoreModules.World.Estate private Scene FindScene(UUID RegionID) { - foreach (Scene s in Scenes) + foreach (Scene s in m_Scenes) { if (s.RegionInfo.RegionID == RegionID) return s; @@ -187,16 +187,14 @@ namespace OpenSim.Region.CoreModules.World.Estate uint estateID = senderScenes.RegionInfo.EstateSettings.EstateID; - foreach (Scene s in Scenes) + foreach (Scene s in m_Scenes) { if (s.RegionInfo.EstateSettings.EstateID == estateID) { IDialogModule dm = s.RequestModuleInterface(); - if (dm != null) { - dm.SendNotificationToUsersInRegion(FromID, FromName, - Message); + dm.SendNotificationToUsersInRegion(FromID, FromName, Message); } } } @@ -209,17 +207,15 @@ namespace OpenSim.Region.CoreModules.World.Estate if (prey.IsZero()) return; - if (!(client.Scene is Scene)) + Scene scene = client.Scene as Scene; + if (scene == null) return; - Scene scene = (Scene)client.Scene; - - uint estateID = scene.RegionInfo.EstateSettings.EstateID; - if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false)) return; - foreach (Scene s in Scenes) + uint estateID = scene.RegionInfo.EstateSettings.EstateID; + foreach (Scene s in m_Scenes) { if (s.RegionInfo.EstateSettings.EstateID != estateID) continue; @@ -250,17 +246,15 @@ namespace OpenSim.Region.CoreModules.World.Estate private void OnEstateTeleportAllUsersHomeRequest(IClientAPI client, UUID invoice, UUID senderID) { - if (!(client.Scene is Scene)) + Scene scene = client.Scene as Scene; + if(scene == null) return; - Scene scene = (Scene)client.Scene; - - uint estateID = scene.RegionInfo.EstateSettings.EstateID; - if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false)) return; - foreach (Scene s in Scenes) + uint estateID = scene.RegionInfo.EstateSettings.EstateID; + foreach (Scene s in m_Scenes) { if (s.RegionInfo.EstateSettings.EstateID != estateID) continue; diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs index 10653ea100..b4c4d7cd38 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs @@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Estate httpResponse.StatusCode = (int)HttpStatusCode.OK; - // m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body); + // m_log.DebugFormat("[ESTATE HANDLER]: query String: {0}", body); try { @@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Estate } catch (Exception e) { - m_log.Debug("[XESTATE]: Exception {0}" + e.ToString()); + m_log.Debug("[ESTATE]: Exception {0}" + e.ToString()); } httpResponse.RawBuffer = FailureResult();