aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-07-13 23:57:45 +0100
committerUbitUmarov2012-07-13 23:57:45 +0100
commit72e2b9409462861d183ac7b391f5911defcd3bb0 (patch)
tree8e150a48fd887300750a51edb7cb213b70f89acc /OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
parent missed fix on vehicle reference frame (diff)
downloadopensim-SC_OLD-72e2b9409462861d183ac7b391f5911defcd3bb0.zip
opensim-SC_OLD-72e2b9409462861d183ac7b391f5911defcd3bb0.tar.gz
opensim-SC_OLD-72e2b9409462861d183ac7b391f5911defcd3bb0.tar.bz2
opensim-SC_OLD-72e2b9409462861d183ac7b391f5911defcd3bb0.tar.xz
In collisions report linksets root parts to parts, and not all parts.
Temporary suspend collision checks on full stopped bodies, until a better away is found wake them, avoiding spurius collision end and start events. Until a nice way is found to avoid them, this may cause some higher cpu load. plus some clean up
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
index 5122ebf..3d108f8 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs
@@ -509,14 +509,14 @@ namespace OpenSim.Region.Physics.OdePlugin
509 if ((thisFlags & CurrentRayFilter) == 0) 509 if ((thisFlags & CurrentRayFilter) == 0)
510 return; 510 return;
511 511
512 ID = ((OdePrim)p2).m_localID; 512 ID = ((OdePrim)p2).LocalID;
513 } 513 }
514 else if (p2 is OdeCharacter) 514 else if (p2 is OdeCharacter)
515 { 515 {
516 if ((CurrentRayFilter & RayFilterFlags.agent) == 0) 516 if ((CurrentRayFilter & RayFilterFlags.agent) == 0)
517 return; 517 return;
518 else 518 else
519 ID = ((OdeCharacter)p2).m_localID; 519 ID = ((OdeCharacter)p2).LocalID;
520 } 520 }
521 else //?? 521 else //??
522 return; 522 return;