aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHomer Horwitz2009-04-06 19:12:26 +0000
committerHomer Horwitz2009-04-06 19:12:26 +0000
commit39f5dd19736f0050a963c5257c8b3f2641819b37 (patch)
tree3d81e6a769bc8e5fce7d17492e63276c2f92fe12
parentApplying Intimidated's patch to fix anim handling. (diff)
downloadopensim-SC_OLD-39f5dd19736f0050a963c5257c8b3f2641819b37.zip
opensim-SC_OLD-39f5dd19736f0050a963c5257c8b3f2641819b37.tar.gz
opensim-SC_OLD-39f5dd19736f0050a963c5257c8b3f2641819b37.tar.bz2
opensim-SC_OLD-39f5dd19736f0050a963c5257c8b3f2641819b37.tar.xz
Added some null-checks to Intimidated's patch in r9024.
Hopefully fixes Mantis #3415.
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e0593ed..2c316a6 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1962,7 +1962,7 @@ namespace OpenSim.Region.Framework.Scenes
1962 { 1962 {
1963 //We're moving 1963 //We're moving
1964 m_allowFalling = true; 1964 m_allowFalling = true;
1965 if (PhysicsActor.IsColliding) 1965 if (PhysicsActor != null && PhysicsActor.IsColliding)
1966 { 1966 {
1967 //And colliding. Can you guess what it is yet? 1967 //And colliding. Can you guess what it is yet?
1968 if ((m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) 1968 if ((m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG) != 0)
@@ -1999,7 +1999,7 @@ namespace OpenSim.Region.Framework.Scenes
1999 else 1999 else
2000 { 2000 {
2001 //We're not colliding. Colliding isn't cool these days. 2001 //We're not colliding. Colliding isn't cool these days.
2002 if (PhysicsActor.Flying) 2002 if (PhysicsActor != null && PhysicsActor.Flying)
2003 { 2003 {
2004 //Are we moving forwards or backwards? 2004 //Are we moving forwards or backwards?
2005 if ((m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) != 0) 2005 if ((m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0 || (m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
@@ -2072,7 +2072,7 @@ namespace OpenSim.Region.Framework.Scenes
2072 else 2072 else
2073 { 2073 {
2074 //We're not moving. 2074 //We're not moving.
2075 if (PhysicsActor.IsColliding) 2075 if (PhysicsActor != null && PhysicsActor.IsColliding)
2076 { 2076 {
2077 //But we are colliding. 2077 //But we are colliding.
2078 if (m_movementAnimation == "FALLDOWN") 2078 if (m_movementAnimation == "FALLDOWN")
@@ -2101,7 +2101,7 @@ namespace OpenSim.Region.Framework.Scenes
2101 { 2101 {
2102 return "PREJUMP"; 2102 return "PREJUMP";
2103 } 2103 }
2104 else if (PhysicsActor.Flying) 2104 else if (PhysicsActor != null && PhysicsActor.Flying)
2105 { 2105 {
2106 m_allowFalling = true; 2106 m_allowFalling = true;
2107 if ((m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0) 2107 if ((m_movementflag & (uint)AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) != 0)
@@ -2126,7 +2126,7 @@ namespace OpenSim.Region.Framework.Scenes
2126 else 2126 else
2127 { 2127 {
2128 //We're not colliding. 2128 //We're not colliding.
2129 if (PhysicsActor.Flying) 2129 if (PhysicsActor != null && PhysicsActor.Flying)
2130 { 2130 {
2131 2131
2132 return "HOVER"; 2132 return "HOVER";