OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge

avinationmerge
Melanie 2011-10-11 23:16:43 +01:00
parent 0ae63d0e8b 56dbab35e1
commit 7891433148
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/EntityBase.cs
View File

@ -114,11 +114,6 @@ namespace OpenSim.Region.Framework.Scenes
m_name = "(basic entity)"; m_name = "(basic entity)";
} }
/// <summary>
///
/// </summary>
public abstract void UpdateMovement();
/// <summary> /// <summary>
/// Performs any updates that need to be done at each frame, as opposed to immediately. /// 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. /// These included scheduled updates and updates that occur due to physics processing.

7
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1312,13 +1312,6 @@ namespace OpenSim.Region.Framework.Scenes
part.ClearUndoState(); 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() public ushort GetTimeDilation()
{ {
return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f); return Utils.FloatToUInt16(m_scene.TimeDilation, 0.0f, 1.0f);

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

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

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3662,7 +3662,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary> /// <summary>
/// Handles part of the PID controller function for moving an avatar. /// Handles part of the PID controller function for moving an avatar.
/// </summary> /// </summary>
public override void UpdateMovement() public void UpdateMovement()
{ {
if (m_forceToApply.HasValue) if (m_forceToApply.HasValue)
{ {