diff options
| author | Melanie | 2013-01-16 16:47:21 +0100 |
|---|---|---|
| committer | Melanie | 2013-01-16 16:47:21 +0100 |
| commit | 518326b04931df63b63ae4fee2b1d57f0d98fe93 (patch) | |
| tree | 688e8ff8ed63f4fb4bb749f64b94b1f447e41832 /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | Change all uses of the removed state queue to the task queue for now. (diff) | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| download | opensim-SC-518326b04931df63b63ae4fee2b1d57f0d98fe93.zip opensim-SC-518326b04931df63b63ae4fee2b1d57f0d98fe93.tar.gz opensim-SC-518326b04931df63b63ae4fee2b1d57f0d98fe93.tar.bz2 opensim-SC-518326b04931df63b63ae4fee2b1d57f0d98fe93.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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 0d18adb..5113210 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -2580,7 +2580,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2580 | if (retMethod != null) | 2580 | if (retMethod != null) |
| 2581 | { | 2581 | { |
| 2582 | ODERayRequest req = new ODERayRequest(); | 2582 | ODERayRequest req = new ODERayRequest(); |
| 2583 | req.geom = IntPtr.Zero; | 2583 | req.actor = null; |
| 2584 | req.callbackMethod = retMethod; | 2584 | req.callbackMethod = retMethod; |
| 2585 | req.length = length; | 2585 | req.length = length; |
| 2586 | req.Normal = direction; | 2586 | req.Normal = direction; |
| @@ -2597,7 +2597,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2597 | if (retMethod != null) | 2597 | if (retMethod != null) |
| 2598 | { | 2598 | { |
| 2599 | ODERayRequest req = new ODERayRequest(); | 2599 | ODERayRequest req = new ODERayRequest(); |
| 2600 | req.geom = IntPtr.Zero; | 2600 | req.actor = null; |
| 2601 | req.callbackMethod = retMethod; | 2601 | req.callbackMethod = retMethod; |
| 2602 | req.length = length; | 2602 | req.length = length; |
| 2603 | req.Normal = direction; | 2603 | req.Normal = direction; |
| @@ -2625,7 +2625,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2625 | }; | 2625 | }; |
| 2626 | 2626 | ||
| 2627 | ODERayRequest req = new ODERayRequest(); | 2627 | ODERayRequest req = new ODERayRequest(); |
| 2628 | req.geom = IntPtr.Zero; | 2628 | req.actor = null; |
| 2629 | req.callbackMethod = retMethod; | 2629 | req.callbackMethod = retMethod; |
| 2630 | req.length = length; | 2630 | req.length = length; |
| 2631 | req.Normal = direction; | 2631 | req.Normal = direction; |
| @@ -2663,7 +2663,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2663 | }; | 2663 | }; |
| 2664 | 2664 | ||
| 2665 | ODERayRequest req = new ODERayRequest(); | 2665 | ODERayRequest req = new ODERayRequest(); |
| 2666 | req.geom = IntPtr.Zero; | 2666 | req.actor = null; |
| 2667 | req.callbackMethod = retMethod; | 2667 | req.callbackMethod = retMethod; |
| 2668 | req.length = length; | 2668 | req.length = length; |
| 2669 | req.Normal = direction; | 2669 | req.Normal = direction; |
| @@ -2710,7 +2710,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2710 | }; | 2710 | }; |
| 2711 | 2711 | ||
| 2712 | ODERayRequest req = new ODERayRequest(); | 2712 | ODERayRequest req = new ODERayRequest(); |
| 2713 | req.geom = geom; | 2713 | req.actor = actor; |
| 2714 | req.callbackMethod = retMethod; | 2714 | req.callbackMethod = retMethod; |
| 2715 | req.length = length; | 2715 | req.length = length; |
| 2716 | req.Normal = direction; | 2716 | req.Normal = direction; |
| @@ -2745,7 +2745,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2745 | }; | 2745 | }; |
| 2746 | 2746 | ||
| 2747 | ODERayRequest req = new ODERayRequest(); | 2747 | ODERayRequest req = new ODERayRequest(); |
| 2748 | req.geom = IntPtr.Zero; | 2748 | req.actor = null; |
| 2749 | req.callbackMethod = retMethod; | 2749 | req.callbackMethod = retMethod; |
| 2750 | req.Normal = size; | 2750 | req.Normal = size; |
| 2751 | req.Origin = position; | 2751 | req.Origin = position; |
| @@ -2777,7 +2777,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2777 | }; | 2777 | }; |
| 2778 | 2778 | ||
| 2779 | ODERayRequest req = new ODERayRequest(); | 2779 | ODERayRequest req = new ODERayRequest(); |
| 2780 | req.geom = IntPtr.Zero; | 2780 | req.actor = null; |
| 2781 | req.callbackMethod = retMethod; | 2781 | req.callbackMethod = retMethod; |
| 2782 | req.length = radius; | 2782 | req.length = radius; |
| 2783 | req.Origin = position; | 2783 | req.Origin = position; |
| @@ -2819,7 +2819,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2819 | }; | 2819 | }; |
| 2820 | 2820 | ||
| 2821 | ODERayRequest req = new ODERayRequest(); | 2821 | ODERayRequest req = new ODERayRequest(); |
| 2822 | req.geom = geom; | 2822 | req.actor = null; |
| 2823 | req.callbackMethod = retMethod; | 2823 | req.callbackMethod = retMethod; |
| 2824 | req.length = plane.W; | 2824 | req.length = plane.W; |
| 2825 | req.Normal.X = plane.X; | 2825 | req.Normal.X = plane.X; |