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

Fixed: scripted controls didn't work if the avatar was sitting down 

This fixes a bug introduced in 6473674bbf
0.7.4.1
Oren Hurvitz 2012-04-28 17:42:49 +03:00 committed by Justin Clark-Casey (justincc)
parent 4ad45934c6
commit fe8e835bfc
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1336,6 +1336,7 @@ namespace OpenSim.Region.Framework.Scenes
PhysicsActor actor = PhysicsActor; PhysicsActor actor = PhysicsActor;
if (actor == null) if (actor == null)
{ {
SafeSendControlsToScripts(flagsForScripts);
return; return;
} }
@ -1512,6 +1513,14 @@ namespace OpenSim.Region.Framework.Scenes
if (update_movementflag && ParentID == 0) if (update_movementflag && ParentID == 0)
Animator.UpdateMovementAnimations(); Animator.UpdateMovementAnimations();
SafeSendControlsToScripts(flagsForScripts);
}
m_scene.EventManager.TriggerOnClientMovement(this);
}
private void SafeSendControlsToScripts(uint flagsForScripts)
{
lock (scriptedcontrols) lock (scriptedcontrols)
{ {
if (scriptedcontrols.Count > 0) if (scriptedcontrols.Count > 0)
@ -1523,9 +1532,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
m_scene.EventManager.TriggerOnClientMovement(this);
}
/// <summary> /// <summary>
/// Calculate an update to move the presence to the set target. /// Calculate an update to move the presence to the set target.
/// </summary> /// </summary>