diff options
| author | Melanie | 2013-02-04 19:21:39 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-04 19:21:39 +0000 |
| commit | 7482ad1c22e44e03c1a36f1d67d862084c20dae6 (patch) | |
| tree | 9450dd7cbe79e1d34b6d0519d994b1fd16a253ed /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.zip opensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.gz opensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.bz2 opensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -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 38a9cb0..f4a812c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -12342,7 +12342,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 12342 | if (checkNonPhysical) | 12342 | if (checkNonPhysical) |
| 12343 | rayfilter |= RayFilterFlags.nonphysical; | 12343 | rayfilter |= RayFilterFlags.nonphysical; |
| 12344 | if (detectPhantom) | 12344 | if (detectPhantom) |
| 12345 | rayfilter |= RayFilterFlags.LSLPhanton; | 12345 | rayfilter |= RayFilterFlags.LSLPhantom; |
| 12346 | 12346 | ||
| 12347 | Vector3 direction = dir * ( 1/dist); | 12347 | Vector3 direction = dir * ( 1/dist); |
| 12348 | 12348 | ||