diff options
author | Melanie | 2011-10-11 23:16:43 +0100 |
---|---|---|
committer | Melanie | 2011-10-11 23:16:43 +0100 |
commit | 789143314845718f9b2e0e24de122fb0593f1431 (patch) | |
tree | 4dd04394717f67400ddb7588a67b6a86ef6350a4 /OpenSim/Region | |
parent | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge (diff) | |
parent | Remove unimplementated UpdateMovement() methods from SOG, SOP. (diff) | |
download | opensim-SC-789143314845718f9b2e0e24de122fb0593f1431.zip opensim-SC-789143314845718f9b2e0e24de122fb0593f1431.tar.gz opensim-SC-789143314845718f9b2e0e24de122fb0593f1431.tar.bz2 opensim-SC-789143314845718f9b2e0e24de122fb0593f1431.tar.xz |
Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge
Diffstat (limited to 'OpenSim/Region')
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 17f02c2..deeccde 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1312,13 +1312,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1312 | part.ClearUndoState(); | 1312 | part.ClearUndoState(); |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | public override void UpdateMovement() | ||
1316 | { | ||
1317 | SceneObjectPart[] parts = m_parts.GetArray(); | ||
1318 | for (int i = 0; i < parts.Length; i++) | ||
1319 | parts[i].UpdateMovement(); | ||
1320 | } | ||
1321 | |||
1322 | public ushort GetTimeDilation() | 1315 | public ushort GetTimeDilation() |
1323 | { | 1316 | { |
1324 | return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f); | 1317 | 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 9364b54..1a96f1b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4244,10 +4244,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4244 | } | 4244 | } |
4245 | } | 4245 | } |
4246 | 4246 | ||
4247 | public virtual void UpdateMovement() | ||
4248 | { | ||
4249 | } | ||
4250 | |||
4251 | /// <summary> | 4247 | /// <summary> |
4252 | /// | 4248 | /// |
4253 | /// </summary> | 4249 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e0ec7c9..dee9bc3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3662,7 +3662,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3662 | /// <summary> | 3662 | /// <summary> |
3663 | /// Handles part of the PID controller function for moving an avatar. | 3663 | /// Handles part of the PID controller function for moving an avatar. |
3664 | /// </summary> | 3664 | /// </summary> |
3665 | public override void UpdateMovement() | 3665 | public void UpdateMovement() |
3666 | { | 3666 | { |
3667 | if (m_forceToApply.HasValue) | 3667 | if (m_forceToApply.HasValue) |
3668 | { | 3668 | { |