diff options
author | Melanie | 2012-03-05 02:37:51 +0100 |
---|---|---|
committer | Melanie | 2012-03-05 02:37:51 +0100 |
commit | c2a73a26b550c523ed0f87c45caa7382bfc16667 (patch) | |
tree | c15f492922ffdd0a6151adbc8cb9df582baca6ec /OpenSim | |
parent | A stab at making llEjectFromLand work in all cases (diff) | |
download | opensim-SC_OLD-c2a73a26b550c523ed0f87c45caa7382bfc16667.zip opensim-SC_OLD-c2a73a26b550c523ed0f87c45caa7382bfc16667.tar.gz opensim-SC_OLD-c2a73a26b550c523ed0f87c45caa7382bfc16667.tar.bz2 opensim-SC_OLD-c2a73a26b550c523ed0f87c45caa7382bfc16667.tar.xz |
SL compatibility - return only points on segemtn, not ray in llCastRay
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 5c02d98..fc6bec1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -11574,6 +11574,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11574 | Vector3 rayEnd = new Vector3((float)end.x, (float)end.y, (float)end.z); | 11574 | Vector3 rayEnd = new Vector3((float)end.x, (float)end.y, (float)end.z); |
11575 | Vector3 dir = rayEnd - rayStart; | 11575 | Vector3 dir = rayEnd - rayStart; |
11576 | 11576 | ||
11577 | float dist = Vector3.Mag(dir); | ||
11578 | |||
11577 | int count = 1; | 11579 | int count = 1; |
11578 | bool detectPhantom = false; | 11580 | bool detectPhantom = false; |
11579 | int dataFlags = 0; | 11581 | int dataFlags = 0; |
@@ -11630,6 +11632,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11630 | int values = 0; | 11632 | int values = 0; |
11631 | foreach (ContactResult result in results) | 11633 | foreach (ContactResult result in results) |
11632 | { | 11634 | { |
11635 | if (result.Depth > dist) | ||
11636 | continue; | ||
11637 | |||
11633 | UUID itemID = UUID.Zero; | 11638 | UUID itemID = UUID.Zero; |
11634 | int linkNum = 0; | 11639 | int linkNum = 0; |
11635 | 11640 | ||