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

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
avinationmerge
Melanie 2009-12-30 20:25:57 +00:00
parent cbe0841bc9 e6c71d6df6
commit d49d44923d
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
const float PREJUMP_DELAY = 0.25f;
#region Inputs
if (m_scenePresence.SitGround)
{
return "SIT_GROUND_CONSTRAINED";
}
AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags;
PhysicsActor actor = m_scenePresence.PhysicsActor;

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

@ -129,6 +129,7 @@ namespace OpenSim.Region.Framework.Scenes
private Vector3? m_forceToApply;
private uint m_requestedSitTargetID;
private UUID m_requestedSitTargetUUID;
public bool SitGround = false;
private SendCourseLocationsMethod m_sendCourseLocationsMethod;
@ -1299,8 +1300,17 @@ namespace OpenSim.Region.Framework.Scenes
if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
{
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/ScenePresence.cs
m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.
Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
=======
// TODO: This doesn't prevent the user from walking yet.
// Setting parent ID would fix this, if we knew what value
// to use. Or we could add a m_isSitting variable.
//Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
SitGround = true;
>>>>>>> master:OpenSim/Region/Framework/Scenes/ScenePresence.cs
}
// In the future, these values might need to go global.
@ -1540,7 +1550,11 @@ namespace OpenSim.Region.Framework.Scenes
}
}
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/ScenePresence.cs
if (update_movementflag)
=======
if (update_movementflag && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) && (m_parentID == 0) && !SitGround)
>>>>>>> master:OpenSim/Region/Framework/Scenes/ScenePresence.cs
Animator.UpdateMovementAnimations();
m_scene.EventManager.TriggerOnClientMovement(this);
@ -1651,8 +1665,12 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
public void StandUp()
{
if (SitGround)
SitGround = false;
if (m_parentID != 0)
{
m_log.Debug("StandupCode Executed");
SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
if (part != null)
{