diff options
author | Justin Clark-Casey (justincc) | 2012-01-27 23:14:34 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-27 23:14:34 +0000 |
commit | abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef (patch) | |
tree | 74506e8e519bdf13305ca595b4a74eed7952c6a4 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |
parent | Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' ... (diff) | |
parent | HG Inventoty: Guard against items not found. (diff) | |
download | opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.zip opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.gz opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.bz2 opensim-SC_OLD-abf0dd4250dcf458c8d0ef71a388a4cf89c4a1ef.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs')
-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 9733683..840d3a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -1054,6 +1054,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1054 | m_LSL_Functions.llLoopSoundSlave(sound, volume); | 1054 | m_LSL_Functions.llLoopSoundSlave(sound, volume); |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | public LSL_Integer llManageEstateAccess(int action, string avatar) | ||
1058 | { | ||
1059 | return m_LSL_Functions.llManageEstateAccess(action, avatar); | ||
1060 | } | ||
1061 | |||
1057 | public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) | 1062 | public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset) |
1058 | { | 1063 | { |
1059 | m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset); | 1064 | m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset); |