diff options
| author | Justin Clark-Casey (justincc) | 2012-06-26 22:12:39 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-26 22:12:39 +0100 |
| commit | 340005c5bfc7b60978b16b0053f30c26a008451c (patch) | |
| tree | 2c7691d65c14839fc2318650cae7235224d36cef /OpenSim | |
| parent | If crossing attachments into another region pre-fatpack, clone objects before... (diff) | |
| parent | Add stub for llCastRay (diff) | |
| download | opensim-SC-340005c5bfc7b60978b16b0053f30c26a008451c.zip opensim-SC-340005c5bfc7b60978b16b0053f30c26a008451c.tar.gz opensim-SC-340005c5bfc7b60978b16b0053f30c26a008451c.tar.bz2 opensim-SC-340005c5bfc7b60978b16b0053f30c26a008451c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 06f5617..a0b3bc8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
| @@ -954,6 +954,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 954 | return m_LSL_Functions.llRequestDisplayName(id); | 954 | return m_LSL_Functions.llRequestDisplayName(id); |
| 955 | } | 955 | } |
| 956 | 956 | ||
| 957 | public LSL_List llCastRay(LSL_Vector start, LSL_Vector end, LSL_List options) | ||
| 958 | { | ||
| 959 | return m_LSL_Functions.llCastRay(start, end, options); | ||
| 960 | } | ||
| 961 | |||
| 957 | public void llLinkParticleSystem(int linknum, LSL_List rules) | 962 | public void llLinkParticleSystem(int linknum, LSL_List rules) |
| 958 | { | 963 | { |
| 959 | m_LSL_Functions.llLinkParticleSystem(linknum, rules); | 964 | m_LSL_Functions.llLinkParticleSystem(linknum, rules); |