ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2026-06-19 01:41:02 +01:00
parent 2720a1db36
commit ecdcaca032
12 changed files with 53 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@@ -1535,10 +1535,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (Exception ex)
{
m_log.Error($"Packet statistics gathering failed: {ex.Message}");
if (PacketLog.Log != null)
{
PacketLog.Log.Close();
}
PacketLog?.Log?.Close();
PacketLog = null;
}
}

14
OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs
View File

@@ -226,8 +226,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
// Pass the new values up to the parent
if (m_parent != null)
m_parent.RegisterRequest(this, Math.Min(RequestedDripRate, TotalDripRequest));
m_parent?.RegisterRequest(this, Math.Min(RequestedDripRate, TotalDripRequest));
}
/// <summary>
@@ -246,8 +245,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
// Pass the new values up to the parent
if (Parent != null)
Parent.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
Parent?.RegisterRequest(this,Math.Min(RequestedDripRate, TotalDripRequest));
}
/// <summary>
@@ -351,8 +349,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
m_dripRate = Math.Clamp(value, m_minimumFlow, MaxDripRate);
if (m_parent != null)
m_parent.RegisterRequest(this, m_dripRate);
m_parent?.RegisterRequest(this, m_dripRate);
}
}
@@ -371,8 +368,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_dripRate = m_maxDripRate * .5f;
else
m_dripRate = m_maxDripRate;
if (m_parent != null)
m_parent.RegisterRequest(this, m_dripRate);
m_parent?.RegisterRequest(this, m_dripRate);
}
/// <summary>
@@ -392,7 +388,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void AcknowledgePackets(Int32 count)
{
if (m_enabled)
AdjustedDripRate = AdjustedDripRate + count;
AdjustedDripRate += count;
}
}
}

6
OpenSim/Region/CoreModules/World/Wind/WindModule.cs
View File

@@ -105,11 +105,9 @@ namespace OpenSim.Region.CoreModules
}
// Check for desired plugin
if (m_availableWindPlugins.ContainsKey(m_dWindPluginName))
if (m_availableWindPlugins.TryGetValue(m_dWindPluginName, out m_activeWindPlugin))
{
m_activeWindPlugin = m_availableWindPlugins[m_dWindPluginName];
m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName);
m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName);
if (m_windConfig != null)
{

3
OpenSim/Region/PhysicsModules/ubOde/ODEModule.cs
View File

@@ -123,8 +123,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (!m_Enabled)
return;
if(m_odeScene != null)
m_odeScene.RegionLoaded();
m_odeScene?.RegionLoaded();
}
#endregion

3
OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs
View File

@@ -1331,8 +1331,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing
}
finally
{
if(stream != null)
stream.Dispose();
stream?.Dispose();
}
if (!ok && File.Exists(filename))