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/Interface | |
| 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/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 282443b..b66537f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -242,6 +242,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 242 | void llLoopSound(string sound, double volume); | 242 | void llLoopSound(string sound, double volume); |
| 243 | void llLoopSoundMaster(string sound, double volume); | 243 | void llLoopSoundMaster(string sound, double volume); |
| 244 | void llLoopSoundSlave(string sound, double volume); | 244 | void llLoopSoundSlave(string sound, double volume); |
| 245 | LSL_Integer llManageEstateAccess(int action, string avatar); | ||
| 245 | void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); | 246 | void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); |
| 246 | void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); | 247 | void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); |
| 247 | void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset); | 248 | void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset); |