diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs index 8e55e0e1c0..13d962e5b4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs @@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage } else { - m_log.DebugFormat("{0} Upload {1} maptiles for {2}", LogHeader, + m_log.DebugFormat("{0} Upload {1} maptiles for {2}", LogHeader, (mapTile.Width * mapTile.Height) / (Constants.RegionSize * Constants.RegionSize), scene.Name); diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 7dc84c646b..d4cd4de257 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -3068,14 +3068,15 @@ namespace OpenSim.Region.Framework.Scenes /// null if no child part with that linknum or child part public SceneObjectPart GetLinkNumPart(int linknum) { - if (linknum < 0) - return null; if (linknum < 2) { - // old code and sl do ignore linknum = 0 on linksets with more than one prim - if (linknum == 0 && m_parts.Count > 1) - return null; - return RootPart; + return linknum switch + { + <0 => null, + // old code and sl do ignore linknum = 0 on linksets with more than one prim + 0 => m_parts.Count > 1 ? null : RootPart, + _ => RootPart + }; } Span parts = m_parts.GetArray().AsSpan(); diff --git a/bin/Warp3D.dll b/bin/Warp3D.dll index b396d88eb2..8e6817e029 100755 Binary files a/bin/Warp3D.dll and b/bin/Warp3D.dll differ