diff options
author | UbitUmarov | 2013-01-03 21:53:21 +0000 |
---|---|---|
committer | UbitUmarov | 2013-01-03 21:53:21 +0000 |
commit | c961cfe19e6dfaf26a0117748edbd66fc2d92823 (patch) | |
tree | de465063c1de64e786bc9ffcdb1eba9038d6fe2f /OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs | |
parent | check land permitions on sit target for unscripted sits (diff) | |
download | opensim-SC-c961cfe19e6dfaf26a0117748edbd66fc2d92823.zip opensim-SC-c961cfe19e6dfaf26a0117748edbd66fc2d92823.tar.gz opensim-SC-c961cfe19e6dfaf26a0117748edbd66fc2d92823.tar.bz2 opensim-SC-c961cfe19e6dfaf26a0117748edbd66fc2d92823.tar.xz |
bug fix, cleanup...
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs index 31757a9..6e9281b 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODERayCastRequestManager.cs | |||
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
144 | qtmp.Y = req.orientation.Y; | 144 | qtmp.Y = req.orientation.Y; |
145 | qtmp.Z = req.orientation.Z; | 145 | qtmp.Z = req.orientation.Z; |
146 | qtmp.W = req.orientation.W; | 146 | qtmp.W = req.orientation.W; |
147 | d.GeomSetOffsetWorldQuaternion(Box, ref qtmp); | 147 | d.GeomSetQuaternion(Box, ref qtmp); |
148 | } | 148 | } |
149 | else if (req.callbackMethod is ProbeSphereCallback) | 149 | else if (req.callbackMethod is ProbeSphereCallback) |
150 | { | 150 | { |
@@ -480,12 +480,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
480 | 480 | ||
481 | if (count == 0) | 481 | if (count == 0) |
482 | return; | 482 | return; |
483 | 483 | /* | |
484 | uint cat1 = d.GeomGetCategoryBits(g1); | 484 | uint cat1 = d.GeomGetCategoryBits(g1); |
485 | uint cat2 = d.GeomGetCategoryBits(g2); | 485 | uint cat2 = d.GeomGetCategoryBits(g2); |
486 | uint col1 = d.GeomGetCollideBits(g1); | 486 | uint col1 = d.GeomGetCollideBits(g1); |
487 | uint col2 = d.GeomGetCollideBits(g2); | 487 | uint col2 = d.GeomGetCollideBits(g2); |
488 | 488 | */ | |
489 | 489 | ||
490 | uint ID = 0; | 490 | uint ID = 0; |
491 | PhysicsActor p2 = null; | 491 | PhysicsActor p2 = null; |