From 1123a326ab703add89944b1e0c3a78be9bc95c45 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 13 Aug 2009 15:43:24 +0900 Subject: [PATCH] Formatting cleanup. Fix some compiler warnings. --- .../Hypergrid/HGCommunicationsGridMode.cs | 3 -- .../Region/Framework/Scenes/EventManager.cs | 2 +- .../Framework/Scenes/SceneObjectPart.cs | 49 +++++++++---------- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 10 ++-- 4 files changed, 28 insertions(+), 36 deletions(-) diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index 99a4057b8a..381070ee82 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs @@ -40,9 +40,6 @@ namespace OpenSim.Region.Communications.Hypergrid { public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 { - private static readonly ILog m_log - = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - IHyperlink m_osw = null; public IHyperlink HGServices { diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 1d4d6d7708..7bbe045063 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs @@ -429,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null; private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; - private ScriptTimerEvent handlerScriptTimerEvent = null; + // TODO: unused: private ScriptTimerEvent handlerScriptTimerEvent = null; private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null; private ScriptColliding handlerCollidingStart = null; diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 61dfa527f2..36468112b5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -1098,30 +1098,29 @@ if (m_shape != null) { } } - private void handleTimerAccounting(uint localID, double interval) - { - if (localID == LocalId) - { - - float sec = (float)interval; - if (m_parentGroup != null) - { - if (sec == 0) - { - if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001) - m_parentGroup.scriptScore = 0; - - m_parentGroup.scriptScore += 0.001f; - return; - } - - if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec)) - m_parentGroup.scriptScore = 0; - m_parentGroup.scriptScore += (0.001f / sec); - } - - } - } + // TODO: unused: + // private void handleTimerAccounting(uint localID, double interval) + // { + // if (localID == LocalId) + // { + // float sec = (float)interval; + // if (m_parentGroup != null) + // { + // if (sec == 0) + // { + // if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001) + // m_parentGroup.scriptScore = 0; + // + // m_parentGroup.scriptScore += 0.001f; + // return; + // } + // + // if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec)) + // m_parentGroup.scriptScore = 0; + // m_parentGroup.scriptScore += (0.001f / sec); + // } + // } + // } #endregion Private Methods @@ -1248,7 +1247,6 @@ if (m_shape != null) { } } - /// /// hook to the physics scene to apply angular impulse /// This is sent up to the group, which then finds the root prim @@ -1809,7 +1807,6 @@ if (m_shape != null) { m_parentGroup.SetHoverHeight(0f, PIDHoverType.Ground, 0f); } - public virtual void OnGrab(Vector3 offsetPos, IClientAPI remoteClient) { } diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index e435ac1e8b..8fdc5a7572 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -304,12 +304,10 @@ namespace OpenSim.Region.Physics.OdePlugin public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); - private uint heightmapWidth = m_regionWidth + 1; - private uint heightmapHeight = m_regionHeight + 1; - - private uint heightmapWidthSamples; - - private uint heightmapHeightSamples; + // TODO: unused: private uint heightmapWidth = m_regionWidth + 1; + // TODO: unused: private uint heightmapHeight = m_regionHeight + 1; + // TODO: unused: private uint heightmapWidthSamples; + // TODO: unused: private uint heightmapHeightSamples; private volatile int m_global_contactcount = 0;