From f852b6455550569d002d0b1c527249f3f7894326 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 26 Dec 2007 17:16:47 +0000 Subject: * This update includes a wide range of changes to the ODEPlugin for avatar movement, including: ** - avatar can navigate stairs better now ** - avatar can land without shooting into the air ** - excessive collisions with the ground are tempered somewhat and should only shoot the avatar up 20m instead of 200m ** - Try Catched a TextureDownloadModule.cs array out of bounds error with a report that causes it not to crash the sim, however it reports a few important items for tracking it down. --- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs') diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 5570136..03f1a70 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -999,17 +999,17 @@ namespace OpenSim.Region.Environment.Scenes if (m_physicsActor.Flying) { direc *= 4; - bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); - bool colliding = (m_physicsActor.IsColliding==true); - if (controlland) - MainLog.Instance.Verbose("AGENT","landCommand"); - if (colliding ) - MainLog.Instance.Verbose("AGENT","colliding"); - if (m_physicsActor.Flying && colliding && controlland) - { - StopFlying(); - MainLog.Instance.Verbose("AGENT", "Stop FLying"); - } + //bool controlland = (((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) || ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG) != 0)); + //bool colliding = (m_physicsActor.IsColliding==true); + //if (controlland) + // MainLog.Instance.Verbose("AGENT","landCommand"); + //if (colliding ) + // MainLog.Instance.Verbose("AGENT","colliding"); + //if (m_physicsActor.Flying && colliding && controlland) + //{ + // StopFlying(); + // MainLog.Instance.Verbose("AGENT", "Stop FLying"); + //} } else { -- cgit v1.1