diff options
| author | Melanie | 2013-01-07 15:06:17 +0100 |
|---|---|---|
| committer | Melanie | 2013-01-07 15:06:17 +0100 |
| commit | 910a94d14390d9cac6d8bc396cc3a61f5ac278d9 (patch) | |
| tree | 8a3d941090aeac4462ea97721c8fd98627005927 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | * This finishes the implementation of AgentCachedTexture. Requires the XBak... (diff) | |
| parent | also exclude land (diff) | |
| download | opensim-SC-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.zip opensim-SC-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.tar.gz opensim-SC-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.tar.bz2 opensim-SC-910a94d14390d9cac6d8bc396cc3a61f5ac278d9.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index d045b59..0d18adb 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -2586,7 +2586,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2586 | req.Normal = direction; | 2586 | req.Normal = direction; |
| 2587 | req.Origin = position; | 2587 | req.Origin = position; |
| 2588 | req.Count = 0; | 2588 | req.Count = 0; |
| 2589 | req.filter = RayFilterFlags.All; | 2589 | req.filter = RayFilterFlags.AllPrims; |
| 2590 | 2590 | ||
| 2591 | m_rayCastManager.QueueRequest(req); | 2591 | m_rayCastManager.QueueRequest(req); |
| 2592 | } | 2592 | } |
| @@ -2603,7 +2603,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2603 | req.Normal = direction; | 2603 | req.Normal = direction; |
| 2604 | req.Origin = position; | 2604 | req.Origin = position; |
| 2605 | req.Count = Count; | 2605 | req.Count = Count; |
| 2606 | req.filter = RayFilterFlags.All; | 2606 | req.filter = RayFilterFlags.AllPrims; |
| 2607 | 2607 | ||
| 2608 | m_rayCastManager.QueueRequest(req); | 2608 | m_rayCastManager.QueueRequest(req); |
| 2609 | } | 2609 | } |
| @@ -2631,7 +2631,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2631 | req.Normal = direction; | 2631 | req.Normal = direction; |
| 2632 | req.Origin = position; | 2632 | req.Origin = position; |
| 2633 | req.Count = Count; | 2633 | req.Count = Count; |
| 2634 | req.filter = RayFilterFlags.All; | 2634 | req.filter = RayFilterFlags.AllPrims; |
| 2635 | 2635 | ||
| 2636 | lock (SyncObject) | 2636 | lock (SyncObject) |
| 2637 | { | 2637 | { |