From 56dbab35e122e724c9277b05820417a05ad8a1be Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 1 Oct 2011 01:26:50 +0100
Subject: [PATCH] Remove unimplementated UpdateMovement() methods from SOG,
 SOP.

SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase.
No point making the code more complex until it actually needs to be,
---
 OpenSim/Region/Framework/Scenes/EntityBase.cs       | 5 -----
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 -------
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs  | 4 ----
 OpenSim/Region/Framework/Scenes/ScenePresence.cs    | 2 +-
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 320b904ff4..680a4a3214 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -114,11 +114,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_name = "(basic entity)";
         }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public abstract void UpdateMovement();
-
         /// <summary>
         /// Performs any updates that need to be done at each frame, as opposed to immediately.
         /// These included scheduled updates and updates that occur due to physics processing.
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 234eb7d2ea..d983d7f79d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1005,13 +1005,6 @@ namespace OpenSim.Region.Framework.Scenes
             part.ClearUndoState();
         }
 
-        public override void UpdateMovement()
-        {
-            SceneObjectPart[] parts = m_parts.GetArray();
-            for (int i = 0; i < parts.Length; i++)
-                parts[i].UpdateMovement();
-        }
-
         public ushort GetTimeDilation()
         {
             return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index d631c12bfc..6fa82b8a88 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4189,10 +4189,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public virtual void UpdateMovement()
-        {
-        }
-
         /// <summary>
         ///
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5b02c3bfc0..b3e04be98d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3313,7 +3313,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Handles part of the PID controller function for moving an avatar.
         /// </summary>
-        public override void UpdateMovement()
+        public void UpdateMovement()
         {
             if (m_forceToApply.HasValue)
             {