From d0d1ab9f2ab0dba30dca4dcc0d63cd7deb990dc6 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 23 Sep 2020 21:07:07 +0100 Subject: [PATCH] cosmetics --- OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 8 +++----- .../Avatar/InstantMessage/HGMessageTransferModule.cs | 12 ++++++------ .../CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 2 +- .../CoreModules/World/WorldMap/HGWorldMapModule.cs | 10 +++++----- .../CoreModules/World/WorldMap/WorldMapModule.cs | 1 - .../OptionalModules/ViewerSupport/SpecialUIModule.cs | 8 +++----- 6 files changed, 18 insertions(+), 23 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 5d194db566..8c09d1fe84 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -495,11 +495,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat protected virtual void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features) { - OSD extras = new OSDMap(); - if (features.ContainsKey("OpenSimExtras")) - extras = features["OpenSimExtras"]; - else - features["OpenSimExtras"] = extras; + OSD extras; + if (!features.TryGetValue("OpenSimExtras", out extras)) + extras = new OSDMap(); if (m_SayRange == null) { diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs index 16e2ec3e59..10497e5ba6 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs @@ -163,10 +163,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage // Is the user a local user? string url = string.Empty; bool foreigner = false; - if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(toAgentID)) // foreign user + if (UserManagementModule != null) // foreign user { url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI"); - foreigner = true; + foreigner = UserManagementModule.IsLocalGridUser(toAgentID); } Util.FireAndForget(delegate @@ -178,12 +178,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage m_log.DebugFormat("[HG MESSAGE TRANSFER]: Got UUI {0}", recipientUUI); if (recipientUUI != string.Empty) { - UUID id; string u = string.Empty, first = string.Empty, last = string.Empty, secret = string.Empty; - if (Util.ParseUniversalUserIdentifier(recipientUUI, out id, out u, out first, out last, out secret)) + UUID id; string tourl = string.Empty, first = string.Empty, last = string.Empty, secret = string.Empty; + if (Util.ParseUniversalUserIdentifier(recipientUUI, out id, out tourl, out first, out last, out secret)) { - success = m_IMService.OutgoingInstantMessage(im, u, true); + success = m_IMService.OutgoingInstantMessage(im, tourl, true); if (success) - UserManagementModule.AddUser(toAgentID, u + ";" + first + " " + last); + UserManagementModule.AddUser(toAgentID, first, last, tourl); } } } diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 922e39d344..4924bf84c4 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap { float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; - renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f); + renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f, false); renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX * 0.5f, waterHeight, m_scene.RegionInfo.RegionSizeY * 0.5f); diff --git a/OpenSim/Region/CoreModules/World/WorldMap/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/HGWorldMapModule.cs index 13179048e4..00463af326 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/HGWorldMapModule.cs @@ -78,6 +78,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid Util.GetConfigVarFromSections(source, "ExportMapAddScale", configSections, m_exportPrintScale); m_exportPrintRegionName = Util.GetConfigVarFromSections(source, "ExportMapAddRegionName", configSections, m_exportPrintRegionName); + m_localV1MapAssets = + Util.GetConfigVarFromSections(source, "LocalV1MapAssets", configSections, m_localV1MapAssets); } } @@ -174,11 +176,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid { if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID)) { - OSD extras = new OSDMap(); - if (features.ContainsKey("OpenSimExtras")) - extras = features["OpenSimExtras"]; - else - features["OpenSimExtras"] = extras; + OSD extras; + if (!features.TryGetValue("OpenSimExtras", out extras)) + extras = new OSDMap(); ((OSDMap)extras)["map-server-url"] = m_MapImageServerURL; diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index af0da809d9..ffc5bf6cde 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -157,7 +157,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap Util.GetConfigVarFromSections(config, "ExportMapAddRegionName", configSections, m_exportPrintRegionName); m_localV1MapAssets = Util.GetConfigVarFromSections(config, "LocalV1MapAssets", configSections, m_localV1MapAssets); - } public virtual void AddRegion(Scene scene) diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs index fa8fc66c31..0bafb34bd7 100644 --- a/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs +++ b/OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs @@ -119,20 +119,18 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport m_log.DebugFormat("[SPECIAL UI]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName); if (m_Helper.UserLevel(agentID) <= m_UserLevel) { - OSDMap extrasMap; + OSD extrasMap; OSDMap specialUI = new OSDMap(); using (StreamReader s = new StreamReader(Path.Combine(VIEWER_SUPPORT_DIR, "panel_toolbar.xml"))) { - if (features.ContainsKey("OpenSimExtras")) - extrasMap = (OSDMap)features["OpenSimExtras"]; - else + if (!features.TryGetValue("OpenSimExtras", out extrasMap)) { extrasMap = new OSDMap(); features["OpenSimExtras"] = extrasMap; } specialUI["toolbar"] = OSDMap.FromString(s.ReadToEnd()); - extrasMap["special-ui"] = specialUI; + ((OSDMap)extrasMap)["special-ui"] = specialUI; } m_log.DebugFormat("[SPECIAL UI]: Sending panel_toolbar.xml in {0}", m_scene.RegionInfo.RegionName);