aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-07-25 08:45:15 +0100
committerUbitUmarov2016-07-25 08:45:15 +0100
commit67a32c91bb640e15e7a551396a1aede778821244 (patch)
tree9dbb4b02f148c838a8b5b753df2ce49b0ec18c68
parentremove extra char (diff)
downloadopensim-SC-67a32c91bb640e15e7a551396a1aede778821244.zip
opensim-SC-67a32c91bb640e15e7a551396a1aede778821244.tar.gz
opensim-SC-67a32c91bb640e15e7a551396a1aede778821244.tar.bz2
opensim-SC-67a32c91bb640e15e7a551396a1aede778821244.tar.xz
remove redundant check
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index ee80b10..8d87c30 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -1724,8 +1724,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1724 1724
1725 case ActorTypes.Prim: 1725 case ActorTypes.Prim:
1726 OdePrim pobj = (OdePrim)obj; 1726 OdePrim pobj = (OdePrim)obj;
1727 if (pobj.Body == IntPtr.Zero || (d.BodyIsEnabled(pobj.Body) && !pobj.m_outbounds)) 1727 if (!pobj.m_outbounds && (pobj.Body == IntPtr.Zero || d.BodyIsEnabled(pobj.Body)))
1728 if (!pobj.m_outbounds)
1729 { 1728 {
1730 pobj.AddCollisionFrameTime((int)(odetimestepMS)); 1729 pobj.AddCollisionFrameTime((int)(odetimestepMS));
1731 pobj.SendCollisions(); 1730 pobj.SendCollisions();