Merge branch 'master' of ssh://MyConnection/var/git/opensim

1 files changed, 23 insertions, 26 deletions

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) {
             }
         }
 
-        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) {
             }
         }
 
-
         /// <summary>
         /// 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)
         {
         }