diff options
| author | UbitUmarov | 2012-06-28 10:57:47 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-06-28 10:57:47 +0100 |
| commit | de10a16546029663cd5df12db615582b7a50831d (patch) | |
| tree | 5d1eb9e38269902a39f9671e2f11b1b639839bb8 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | fix a seg fault in sp.cs (diff) | |
| parent | Comment out a spammy message that will spew 4 lines for each request to a (diff) | |
| download | opensim-SC-de10a16546029663cd5df12db615582b7a50831d.zip opensim-SC-de10a16546029663cd5df12db615582b7a50831d.tar.gz opensim-SC-de10a16546029663cd5df12db615582b7a50831d.tar.bz2 opensim-SC-de10a16546029663cd5df12db615582b7a50831d.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 05adf8e..75add29 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -12416,9 +12416,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12416 | 12416 | ||
| 12417 | ContactResult result = new ContactResult (); | 12417 | ContactResult result = new ContactResult (); |
| 12418 | result.ConsumerID = group.LocalId; | 12418 | result.ConsumerID = group.LocalId; |
| 12419 | result.Depth = intersection.distance; | 12419 | // result.Depth = intersection.distance; |
| 12420 | result.Normal = intersection.normal; | 12420 | result.Normal = intersection.normal; |
| 12421 | result.Pos = intersection.ipoint; | 12421 | result.Pos = intersection.ipoint; |
| 12422 | result.Depth = Vector3.Mag(rayStart - result.Pos); | ||
| 12422 | 12423 | ||
| 12423 | contacts.Add(result); | 12424 | contacts.Add(result); |
| 12424 | }); | 12425 | }); |
| @@ -12613,7 +12614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12613 | bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); | 12614 | bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); |
| 12614 | 12615 | ||
| 12615 | 12616 | ||
| 12616 | if (World.SuportsRayCastFiltered()) | 12617 | if (false)// World.SuportsRayCastFiltered()) |
| 12617 | { | 12618 | { |
| 12618 | if (dist == 0) | 12619 | if (dist == 0) |
| 12619 | return list; | 12620 | return list; |