diff options
author | Jeff Ames | 2009-08-13 15:43:24 +0900 |
---|---|---|
committer | Jeff Ames | 2009-08-13 15:43:24 +0900 |
commit | 1123a326ab703add89944b1e0c3a78be9bc95c45 (patch) | |
tree | 3ca8493f4a8aec64cc372a7b2e58ccda6b4c0363 /OpenSim/Region | |
parent | minor:comments (diff) | |
download | opensim-SC-1123a326ab703add89944b1e0c3a78be9bc95c45.zip opensim-SC-1123a326ab703add89944b1e0c3a78be9bc95c45.tar.gz opensim-SC-1123a326ab703add89944b1e0c3a78be9bc95c45.tar.bz2 opensim-SC-1123a326ab703add89944b1e0c3a78be9bc95c45.tar.xz |
Formatting cleanup. Fix some compiler warnings.
Diffstat (limited to 'OpenSim/Region')
4 files changed, 28 insertions, 36 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs index 99a4057..381070e 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs | |||
@@ -40,9 +40,6 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
40 | { | 40 | { |
41 | public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 | 41 | public class HGCommunicationsGridMode : CommunicationsManager // CommunicationsOGS1 |
42 | { | 42 | { |
43 | private static readonly ILog m_log | ||
44 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
46 | IHyperlink m_osw = null; | 43 | IHyperlink m_osw = null; |
47 | public IHyperlink HGServices | 44 | public IHyperlink HGServices |
48 | { | 45 | { |
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 1d4d6d7..7bbe045 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
429 | private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null; | 429 | private RequestParcelPrimCountUpdate handlerRequestParcelPrimCountUpdate = null; |
430 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; | 430 | private ParcelPrimCountTainted handlerParcelPrimCountTainted = null; |
431 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; | 431 | private ObjectBeingRemovedFromScene handlerObjectBeingRemovedFromScene = null; |
432 | private ScriptTimerEvent handlerScriptTimerEvent = null; | 432 | // TODO: unused: private ScriptTimerEvent handlerScriptTimerEvent = null; |
433 | private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null; | 433 | private EstateToolsSunUpdate handlerEstateToolsSunUpdate = null; |
434 | 434 | ||
435 | private ScriptColliding handlerCollidingStart = null; | 435 | private ScriptColliding handlerCollidingStart = null; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 61dfa52..3646811 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1098,30 +1098,29 @@ if (m_shape != null) { | |||
1098 | } | 1098 | } |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | private void handleTimerAccounting(uint localID, double interval) | 1101 | // TODO: unused: |
1102 | { | 1102 | // private void handleTimerAccounting(uint localID, double interval) |
1103 | if (localID == LocalId) | 1103 | // { |
1104 | { | 1104 | // if (localID == LocalId) |
1105 | 1105 | // { | |
1106 | float sec = (float)interval; | 1106 | // float sec = (float)interval; |
1107 | if (m_parentGroup != null) | 1107 | // if (m_parentGroup != null) |
1108 | { | 1108 | // { |
1109 | if (sec == 0) | 1109 | // if (sec == 0) |
1110 | { | 1110 | // { |
1111 | if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001) | 1111 | // if (m_parentGroup.scriptScore + 0.001f >= float.MaxValue - 0.001) |
1112 | m_parentGroup.scriptScore = 0; | 1112 | // m_parentGroup.scriptScore = 0; |
1113 | 1113 | // | |
1114 | m_parentGroup.scriptScore += 0.001f; | 1114 | // m_parentGroup.scriptScore += 0.001f; |
1115 | return; | 1115 | // return; |
1116 | } | 1116 | // } |
1117 | 1117 | // | |
1118 | if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec)) | 1118 | // if (m_parentGroup.scriptScore + (0.001f / sec) >= float.MaxValue - (0.001f / sec)) |
1119 | m_parentGroup.scriptScore = 0; | 1119 | // m_parentGroup.scriptScore = 0; |
1120 | m_parentGroup.scriptScore += (0.001f / sec); | 1120 | // m_parentGroup.scriptScore += (0.001f / sec); |
1121 | } | 1121 | // } |
1122 | 1122 | // } | |
1123 | } | 1123 | // } |
1124 | } | ||
1125 | 1124 | ||
1126 | #endregion Private Methods | 1125 | #endregion Private Methods |
1127 | 1126 | ||
@@ -1248,7 +1247,6 @@ if (m_shape != null) { | |||
1248 | } | 1247 | } |
1249 | } | 1248 | } |
1250 | 1249 | ||
1251 | |||
1252 | /// <summary> | 1250 | /// <summary> |
1253 | /// hook to the physics scene to apply angular impulse | 1251 | /// hook to the physics scene to apply angular impulse |
1254 | /// This is sent up to the group, which then finds the root prim | 1252 | /// This is sent up to the group, which then finds the root prim |
@@ -1809,7 +1807,6 @@ if (m_shape != null) { | |||
1809 | m_parentGroup.SetHoverHeight(0f, PIDHoverType.Ground, 0f); | 1807 | m_parentGroup.SetHoverHeight(0f, PIDHoverType.Ground, 0f); |
1810 | } | 1808 | } |
1811 | 1809 | ||
1812 | |||
1813 | public virtual void OnGrab(Vector3 offsetPos, IClientAPI remoteClient) | 1810 | public virtual void OnGrab(Vector3 offsetPos, IClientAPI remoteClient) |
1814 | { | 1811 | { |
1815 | } | 1812 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index e435ac1..8fdc5a7 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -304,12 +304,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
304 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); | 304 | public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f); |
305 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); | 305 | public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f); |
306 | 306 | ||
307 | private uint heightmapWidth = m_regionWidth + 1; | 307 | // TODO: unused: private uint heightmapWidth = m_regionWidth + 1; |
308 | private uint heightmapHeight = m_regionHeight + 1; | 308 | // TODO: unused: private uint heightmapHeight = m_regionHeight + 1; |
309 | 309 | // TODO: unused: private uint heightmapWidthSamples; | |
310 | private uint heightmapWidthSamples; | 310 | // TODO: unused: private uint heightmapHeightSamples; |
311 | |||
312 | private uint heightmapHeightSamples; | ||
313 | 311 | ||
314 | private volatile int m_global_contactcount = 0; | 312 | private volatile int m_global_contactcount = 0; |
315 | 313 | ||