Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge

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.

OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

@@ -1312,13 +1312,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);

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -4244,10 +4244,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public virtual void UpdateMovement()
-        {
-        }
-
         /// <summary>
         ///
         /// </summary>

OpenSim/Region/Framework/Scenes/ScenePresence.cs

@@ -3662,7 +3662,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)
             {