diff options
| author | teravus | 2013-01-01 00:59:30 -0500 |
|---|---|---|
| committer | teravus | 2013-01-01 00:59:30 -0500 |
| commit | ce4b09cf63c0e39f3782a0a714811de4f943b662 (patch) | |
| tree | 33485c6b11b91814b5c23d0d544326f8bdb8b5d7 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | * Fixed a bug that replayed old cached appearance when changing outfits (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-ce4b09cf63c0e39f3782a0a714811de4f943b662.zip opensim-SC-ce4b09cf63c0e39f3782a0a714811de4f943b662.tar.gz opensim-SC-ce4b09cf63c0e39f3782a0a714811de4f943b662.tar.bz2 opensim-SC-ce4b09cf63c0e39f3782a0a714811de4f943b662.tar.xz | |
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
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 | { |