ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where tapping home to stop falling would stop any avatar movement other than falling again.

Browse Source 
Addresses http://opensimulator.org/mantis/view.php?id=5839
This commit is contained in:
Justin Clark-Casey (justincc)
2012-01-07 00:17:40 +00:00
parent 679d155a39
commit c5c079f6aa
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@@ -223,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
m_animTickFall = 0;
m_animTickJump = 0;
m_jumping = false;
m_falling = true;
m_falling = false;
m_jumpVelocity = 0f;
actor.Selected = false;
m_fallHeight = actor.Position.Z; // save latest flying height
@@ -238,10 +238,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
}
else if (move.Z < 0f)
{
if (actor != null && actor.IsColliding)
{
if (actor != null && actor.IsColliding)
return "LAND";
}
else
return "HOVER_DOWN";
}
@@ -260,7 +258,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
float fallElapsed = (float)(Environment.TickCount - m_animTickFall);
float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f;
if (!m_jumping && (fallVelocity < -3.0f) ) m_falling = true;
if (!m_jumping && (fallVelocity < -3.0f))
m_falling = true;
if (m_animTickFall == 0 || (fallVelocity >= 0.0f))
{
@@ -297,9 +296,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
return "PREJUMP";
}
if(m_jumping)
if (m_jumping)
{
if ( (jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
if ((jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
{
// end jumping
m_jumping = false;