diff options
| author | teravus | 2013-02-03 08:18:53 -0500 |
|---|---|---|
| committer | teravus | 2013-02-03 08:18:53 -0500 |
| commit | ee4f8ac19356497d75585dc447c648c3d0473818 (patch) | |
| tree | 8bef5b2b48e57748dff8e8b97fb095c9fe90fcc0 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Changing OpenSimDefaults back to default (diff) | |
| parent | Merge branch 'master' of ssh://opensim/var/git/opensim (diff) | |
| download | opensim-SC_OLD-ee4f8ac19356497d75585dc447c648c3d0473818.zip opensim-SC_OLD-ee4f8ac19356497d75585dc447c648c3d0473818.tar.gz opensim-SC_OLD-ee4f8ac19356497d75585dc447c648c3d0473818.tar.bz2 opensim-SC_OLD-ee4f8ac19356497d75585dc447c648c3d0473818.tar.xz | |
Merge branch 'master' into JSONTCPClient
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 81de9ab..0db6fe3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -11381,7 +11381,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 11381 | if (checkNonPhysical) | 11381 | if (checkNonPhysical) |
| 11382 | rayfilter |= RayFilterFlags.nonphysical; | 11382 | rayfilter |= RayFilterFlags.nonphysical; |
| 11383 | if (detectPhantom) | 11383 | if (detectPhantom) |
| 11384 | rayfilter |= RayFilterFlags.LSLPhanton; | 11384 | rayfilter |= RayFilterFlags.LSLPhantom; |
| 11385 | 11385 | ||
| 11386 | Vector3 direction = dir * ( 1/dist); | 11386 | Vector3 direction = dir * ( 1/dist); |
| 11387 | 11387 | ||