aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 13d4562..6b31555 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -123,7 +123,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
123 /// </summary> 123 /// </summary>
124 /// <param name='animID'></param> 124 /// <param name='animID'></param>
125 /// <param name='allowNoDefault'> 125 /// <param name='allowNoDefault'>
126 /// If true, then the default animation can be entirely removed. 126 /// If true, then the default animation can be entirely removed.
127 /// If false, then removing the default animation will reset it to the simulator default (currently STAND). 127 /// If false, then removing the default animation will reset it to the simulator default (currently STAND).
128 /// </param> 128 /// </param>
129 public void RemoveAnimation(UUID animID, bool allowNoDefault) 129 public void RemoveAnimation(UUID animID, bool allowNoDefault)
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
192 /// that are mutually exclusive, e.g. flying and sitting. 192 /// that are mutually exclusive, e.g. flying and sitting.
193 /// </summary> 193 /// </summary>
194 /// <returns>'true' if the animation was updated</returns> 194 /// <returns>'true' if the animation was updated</returns>
195 /// 195 ///
196 196
197 197
198 198
@@ -488,7 +488,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
488 m_animTickLand = Environment.TickCount; 488 m_animTickLand = Environment.TickCount;
489 // TODO: SOFT_LAND support 489 // TODO: SOFT_LAND support
490 float fallVsq = m_lastFallVelocity * m_lastFallVelocity; 490 float fallVsq = m_lastFallVelocity * m_lastFallVelocity;
491 if (fallVsq > 300f) // aprox 20*h 491 if (fallVsq > 300f) // aprox 20*h
492 return "STANDUP"; 492 return "STANDUP";
493 else if (fallVsq > 160f) 493 else if (fallVsq > 160f)
494 return "SOFT_LAND"; 494 return "SOFT_LAND";