diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index 82f829d9a4..ffcc44bf5e 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs @@ -34,8 +34,6 @@ namespace OpenSim.Region.Environment.Scenes { public abstract class EntityBase { - protected List m_children; - protected Scene m_scene; public Scene Scene @@ -113,33 +111,17 @@ namespace OpenSim.Region.Environment.Scenes Rotation = new Quaternion(); m_name = "(basic entity)"; m_rotationalvelocity = new LLVector3(0, 0, 0); - m_children = new List(); } /// /// /// - public virtual void UpdateMovement() - { - foreach (EntityBase child in m_children) - - { - child.UpdateMovement(); - } - } + public abstract void UpdateMovement(); /// - /// Performs any updates that need to be done at each frame. This function is overridable from it's children. + /// Performs any updates that need to be done at each frame. /// - public virtual void Update() - { - // Do any per-frame updates needed that are applicable to every type of entity - - foreach (EntityBase child in m_children) - { - child.Update(); - } - } + public abstract void Update(); /// /// Copies the entity @@ -174,4 +156,4 @@ namespace OpenSim.Region.Environment.Scenes HitTF = _HitTF; } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index eb5a80c566..5ae657ef6e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1585,8 +1585,6 @@ namespace OpenSim.Region.Environment.Scenes { part.UpdateMovement(); } - - base.UpdateMovement(); } ///