diff options
author | Melanie | 2013-01-23 20:29:05 +0100 |
---|---|---|
committer | Melanie | 2013-01-23 20:29:05 +0100 |
commit | c75508ec8d236b45c65c80d479ed7c24dd3343ce (patch) | |
tree | 379fac7034418a9bacf60b05b35a23b5b17ac61d /OpenSim/Region/ScriptEngine | |
parent | Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and (diff) | |
download | opensim-SC-c75508ec8d236b45c65c80d479ed7c24dd3343ce.zip opensim-SC-c75508ec8d236b45c65c80d479ed7c24dd3343ce.tar.gz opensim-SC-c75508ec8d236b45c65c80d479ed7c24dd3343ce.tar.bz2 opensim-SC-c75508ec8d236b45c65c80d479ed7c24dd3343ce.tar.xz |
Fix a type (Suports => Supports). Also put the normal terrain collision check
into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0562c7f..703c54d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -12209,7 +12209,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12209 | bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); | 12209 | bool checkPhysical = !((rejectTypes & ScriptBaseClass.RC_REJECT_PHYSICAL) == ScriptBaseClass.RC_REJECT_PHYSICAL); |
12210 | 12210 | ||
12211 | 12211 | ||
12212 | if (World.SuportsRayCastFiltered()) | 12212 | if (World.SupportsRayCastFiltered()) |
12213 | { | 12213 | { |
12214 | if (dist == 0) | 12214 | if (dist == 0) |
12215 | return list; | 12215 | return list; |
@@ -12272,13 +12272,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12272 | } | 12272 | } |
12273 | else | 12273 | else |
12274 | { | 12274 | { |
12275 | if (checkTerrain) | ||
12276 | { | ||
12277 | ContactResult? groundContact = GroundIntersection(rayStart, rayEnd); | ||
12278 | if (groundContact != null) | ||
12279 | results.Add((ContactResult)groundContact); | ||
12280 | } | ||
12281 | |||
12282 | if (checkAgents) | 12275 | if (checkAgents) |
12283 | { | 12276 | { |
12284 | ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd); | 12277 | ContactResult[] agentHits = AvatarIntersection(rayStart, rayEnd); |
@@ -12294,6 +12287,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
12294 | } | 12287 | } |
12295 | } | 12288 | } |
12296 | 12289 | ||
12290 | if (checkTerrain) | ||
12291 | { | ||
12292 | ContactResult? groundContact = GroundIntersection(rayStart, rayEnd); | ||
12293 | if (groundContact != null) | ||
12294 | results.Add((ContactResult)groundContact); | ||
12295 | } | ||
12296 | |||
12297 | results.Sort(delegate(ContactResult a, ContactResult b) | 12297 | results.Sort(delegate(ContactResult a, ContactResult b) |
12298 | { | 12298 | { |
12299 | return a.Depth.CompareTo(b.Depth); | 12299 | return a.Depth.CompareTo(b.Depth); |