aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-01 01:26:50 +0100
committerJustin Clark-Casey (justincc)2011-10-01 01:26:50 +0100
commit56dbab35e122e724c9277b05820417a05ad8a1be (patch)
tree890d48a61efe8a43ace2b5e667069b4cf3d0d628 /OpenSim/Region/Framework
parentRemove OpenSim.Region.Examples.SimpleModule (diff)
downloadopensim-SC_OLD-56dbab35e122e724c9277b05820417a05ad8a1be.zip
opensim-SC_OLD-56dbab35e122e724c9277b05820417a05ad8a1be.tar.gz
opensim-SC_OLD-56dbab35e122e724c9277b05820417a05ad8a1be.tar.bz2
opensim-SC_OLD-56dbab35e122e724c9277b05820417a05ad8a1be.tar.xz
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,
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityBase.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
4 files changed, 1 insertions, 17 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs
index 320b904..680a4a3 100644
--- a/OpenSim/Region/Framework/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs
@@ -115,11 +115,6 @@ namespace OpenSim.Region.Framework.Scenes
115 } 115 }
116 116
117 /// <summary> 117 /// <summary>
118 ///
119 /// </summary>
120 public abstract void UpdateMovement();
121
122 /// <summary>
123 /// Performs any updates that need to be done at each frame, as opposed to immediately. 118 /// Performs any updates that need to be done at each frame, as opposed to immediately.
124 /// These included scheduled updates and updates that occur due to physics processing. 119 /// These included scheduled updates and updates that occur due to physics processing.
125 /// </summary> 120 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 234eb7d..d983d7f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1005,13 +1005,6 @@ namespace OpenSim.Region.Framework.Scenes
1005 part.ClearUndoState(); 1005 part.ClearUndoState();
1006 } 1006 }
1007 1007
1008 public override void UpdateMovement()
1009 {
1010 SceneObjectPart[] parts = m_parts.GetArray();
1011 for (int i = 0; i < parts.Length; i++)
1012 parts[i].UpdateMovement();
1013 }
1014
1015 public ushort GetTimeDilation() 1008 public ushort GetTimeDilation()
1016 { 1009 {
1017 return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f); 1010 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 d631c12..6fa82b8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4189,10 +4189,6 @@ namespace OpenSim.Region.Framework.Scenes
4189 } 4189 }
4190 } 4190 }
4191 4191
4192 public virtual void UpdateMovement()
4193 {
4194 }
4195
4196 /// <summary> 4192 /// <summary>
4197 /// 4193 ///
4198 /// </summary> 4194 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5b02c3b..b3e04be 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3313,7 +3313,7 @@ namespace OpenSim.Region.Framework.Scenes
3313 /// <summary> 3313 /// <summary>
3314 /// Handles part of the PID controller function for moving an avatar. 3314 /// Handles part of the PID controller function for moving an avatar.
3315 /// </summary> 3315 /// </summary>
3316 public override void UpdateMovement() 3316 public void UpdateMovement()
3317 { 3317 {
3318 if (m_forceToApply.HasValue) 3318 if (m_forceToApply.HasValue)
3319 { 3319 {