From c71e61dfd62819e520f09be0b21ebe7a921db979 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 25 Nov 2025 17:45:06 +0000 Subject: [PATCH] cosmetics --- .../World/Terrain/FileLoaders/TIFF.cs | 3 +- .../World/Terrain/TerrainModule.cs | 63 +++++++++---------- .../World/Warp3DMap/Warp3DImageModule.cs | 8 ++- .../Framework/Scenes/SceneObjectGroup.cs | 11 ++-- .../Region/Framework/Scenes/TerrainChannel.cs | 9 ++- 5 files changed, 49 insertions(+), 45 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs index 1327ef5d98..b10e7b983f 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs @@ -30,7 +30,6 @@ using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; -using OpenMetaverse.ImportExport.Collada14; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; @@ -70,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders public override ITerrainChannel LoadStream(Stream stream) { - return LoadTIFF(String.Empty, out int _, stream, null); + return LoadTIFF(string.Empty, out int _, stream, null); } public override void SaveFile(string filename, ITerrainChannel map) diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index eb3afc1a94..b6fc90d238 100755 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using System; -using System.Collections; using System.Collections.Generic; using System.IO; using System.Reflection; @@ -74,9 +73,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain private object _modifyLock = new(); -#pragma warning disable 414 - private static readonly string LogHeader = "[TERRAIN]: "; -#pragma warning restore 414 + private const string LogHeader = "[TERRAIN]: "; private readonly Commander m_commander = new("terrain"); private readonly Dictionary m_loaders = []; @@ -211,10 +208,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain /// /// Human readable list of terrain file extensions that are supported. /// - private string m_supportedFileExtensions = String.Empty; + private string m_supportedFileExtensions = string.Empty; //For terrain save-tile file extensions - private string m_supportFileExtensionsForTileSave = String.Empty; + private string m_supportFileExtensionsForTileSave = string.Empty; #region ICommandableModule Members @@ -377,36 +374,34 @@ namespace OpenSim.Region.CoreModules.World.Terrain throw new ArgumentException(String.Format("wrong size, use a file with size {0} x {1}", m_scene.RegionInfo.RegionSizeX, m_scene.RegionInfo.RegionSizeY)); } - m_log.DebugFormat(LogHeader + "Loaded terrain, wd/ht: {0}/{1}", channel.Width, channel.Height); + m_log.Debug($"{LogHeader}Loaded terrain, wd/ht: {channel.Width}/{channel.Height}"); m_scene.Heightmap = channel; m_channel = channel; UpdateBakedMap(); } catch (NotImplementedException) { - m_log.ErrorFormat(LogHeader + "Unable to load heightmap, the {0} parser does not support file loading. (May be save only)", loader.Value); - throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value)); + m_log.ErrorFormat($"{LogHeader}Unable to load heightmap, the {loader.Value} parser does not support file loading. (May be save only)"); + throw new TerrainException($"unable to load heightmap: parser {loader.Value} does not support loading"); } catch (FileNotFoundException) { - m_log.ErrorFormat(LogHeader + "Unable to load heightmap, file not found. (A directory permissions error may also cause this)"); - throw new TerrainException( - String.Format("unable to load heightmap: file {0} not found (or permissions do not allow access", filename)); + m_log.ErrorFormat($"{LogHeader}Unable to load heightmap, file not found. (A directory permissions error may also cause this)"); + throw new TerrainException($"unable to load heightmap: file {filename} not found (or permissions do not allow access"); } catch (ArgumentException e) { - m_log.ErrorFormat(LogHeader + "Unable to load heightmap: {0}", e.Message); - throw new TerrainException( - String.Format("Unable to load heightmap: {0}", e.Message)); + m_log.Error($"{LogHeader}Unable to load heightmap: {e.Message}"); + throw new TerrainException($"Unable to load heightmap: {e.Message}"); } } - m_log.InfoFormat(LogHeader + "File ({0}) loaded successfully", filename); + m_log.Info($"{LogHeader}File ({filename}) loaded successfully"); return; } } - m_log.Error(LogHeader + "Unable to load heightmap, no file loader available for that format."); - throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename)); + m_log.Error($"{LogHeader}Unable to load heightmap, no file loader available for that format."); + throw new TerrainException($"unable to load heightmap from file {filename}: no loader available for that format"); } /// @@ -422,18 +417,18 @@ namespace OpenSim.Region.CoreModules.World.Terrain if (filename.EndsWith(loader.Key) && loader.Value.SupportedHeight > m_channel.MaxHeight()) { loader.Value.SaveFile(filename, m_channel); - m_log.InfoFormat(LogHeader + "Saved terrain from {0} to {1}", m_scene.RegionInfo.RegionName, filename); + m_log.Info($"{LogHeader}Saved terrain from {m_scene.RegionInfo.RegionName} to {filename}"); return; } } } catch(IOException ioe) { - m_log.ErrorFormat(LogHeader + "Unable to save to {0}, {1}", filename, ioe.Message); + m_log.Error($"{LogHeader}Unable to save to {filename}, {ioe.Message}"); } - m_log.ErrorFormat(LogHeader + "Could not save terrain from {0} to {1}. Valid file extensions are {2}", - m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions); + m_log.Error( + $"{LogHeader}Could not save terrain from {m_scene.RegionInfo.RegionName} to {filename}. Valid file extensions are {m_supportedFileExtensions}"); } /// @@ -473,17 +468,17 @@ namespace OpenSim.Region.CoreModules.World.Terrain } catch(NotImplementedException) { - m_log.ErrorFormat(LogHeader + "Unable to load heightmap, the {0} parser does not support file loading. (May be save only)", loader.Value); - throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value)); + m_log.Error($"{LogHeader}Unable to load heightmap, the {loader.Value} parser does not support file loading. (May be save only)"); + throw new TerrainException($"unable to load heightmap: parser {loader.Value} does not support loading"); } } - m_log.InfoFormat(LogHeader + "File ({0}) loaded successfully", filename); + m_log.Info($"{LogHeader}File ({filename}) loaded successfully"); return; } } - m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader available for that format."); - throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename)); + m_log.Error($"{LogHeader}Unable to load heightmap, no file loader available for that format."); + throw new TerrainException($"unable to load heightmap from file {filename}: no loader available for that format"); } public void LoadFromStream(string filename, Vector3 displacement, @@ -503,12 +498,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain } catch (NotImplementedException) { - m_log.ErrorFormat(LogHeader + "Unable to load heightmap, the {0} parser does not support file loading. (May be save only)", loader.Value); - throw new TerrainException(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value)); + m_log.ErrorFormat($"{LogHeader}Unable to load heightmap, the { loader.Value} parser does not support file loading. (May be save only)"); + throw new TerrainException("unable to load heightmap: parser {loader.Value} does not support loading"); } } - m_log.InfoFormat(LogHeader + "File ({0}) loaded successfully", filename); + m_log.Info($"{LogHeader}File ({filename}) loaded successfully"); return; } } @@ -529,7 +524,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain Stream file = response.GetResponseStream(); if (response.ContentLength == 0) - throw new Exception(String.Format("{0} returned an empty file", uri.ToString())); + throw new Exception($"{uri} returned an empty file"); // return new BufferedStream(file, (int) response.ContentLength); return new BufferedStream(file, 1000000); @@ -597,8 +592,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain } catch(NotImplementedException) { - m_log.ErrorFormat(LogHeader + "Unable to save to {0}, saving of this file format has not been implemented.", filename); - throw new TerrainException(String.Format("Unable to save heightmap: saving of this file format not implemented")); + m_log.Error($"{LogHeader}Unable to save to {filename}, saving of this file format has not been implemented."); + throw new TerrainException("Unable to save heightmap: saving of this file format not implemented"); } } @@ -660,7 +655,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain string[] files = Directory.GetFiles(plugineffectsPath); foreach(string file in files) { - m_log.InfoFormat(LogHeader + "Loading effects in {0}", file); + m_log.Info($"{LogHeader}Loading effects in {file}"); try { Assembly library = Assembly.LoadFrom(file); diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 312f55280e..63c33aa3b9 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -433,7 +433,13 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap delegate (SceneObjectGroup group) { foreach (SceneObjectPart child in group.Parts) - CreatePrim(renderer, child); + { + try { CreatePrim(renderer, child); } + catch (Exception e) + { + m_log.Warn($"[Warp3D] failed to render prim {child.Name} at {child.GetWorldPosition()}: {e.Message}"); + } + } } ); } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 06855fadc1..ef6a608a88 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2292,14 +2292,15 @@ namespace OpenSim.Region.Framework.Scenes public void SetText(string text, Vector3 color, double alpha) { - Color = Color.FromArgb(0xff - (int) (alpha * 0xff), + Color newcolor = Color.FromArgb(0xff - (int) (alpha * 0xff), (int) (color.X * 0xff), (int) (color.Y * 0xff), (int) (color.Z * 0xff)); - Text = text; - - HasGroupChanged = true; - m_rootPart.ScheduleFullUpdate(); + if(Text != text || newcolor!= Color) + { + HasGroupChanged = true; + m_rootPart.ScheduleFullUpdate(); + } } /// diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 4ac97d9c8a..03edff18f3 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs @@ -47,8 +47,9 @@ namespace OpenSim.Region.Framework.Scenes /// public class TerrainChannel : ITerrainChannel { + const string LogHeader = "[TERRAIN CHANNEL]: "; + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static string LogHeader = "[TERRAIN CHANNEL]: "; protected TerrainData m_terrainData; @@ -177,12 +178,14 @@ namespace OpenSim.Region.Framework.Scenes public int MaxHeight() { - float max = 0; + float max = float.MinValue; for (int ii = 0; ii < Width; ii++) { for (int jj = 0; jj < Height; jj++) { - max = (m_terrainData[ii, jj] > max) ? m_terrainData[ii, jj] : max; + float cur = m_terrainData[ii, jj]; + if(cur > max) + max = cur; } } return (int)max + 1;