diff options
| author | teravus | 2013-02-03 08:14:47 -0500 |
|---|---|---|
| committer | teravus | 2013-02-03 08:14:47 -0500 |
| commit | 8fd99ecab14c06ef61b8e6d8c5a3a1452669639b (patch) | |
| tree | 0ef3d872a7f7a72941f7aebb5d15042681ff6697 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Adds the ability to load more then one IClientNetworkServer thereby allowing ... (diff) | |
| parent | Merge /home/opensim/src/opensim (diff) | |
| download | opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.zip opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.tar.gz opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.tar.bz2 opensim-SC-8fd99ecab14c06ef61b8e6d8c5a3a1452669639b.tar.xz | |
Merge branch 'master' of ssh://opensim/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -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 | ||