diff options
| author | Melanie | 2012-01-26 23:07:31 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 23:07:31 +0000 |
| commit | 9d60b84f7805b78ae9413b4dc66c2fbbf387e503 (patch) | |
| tree | 6aa89951925561a5dbe031b9a92e9dd49c0a272a /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.zip opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.gz opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.bz2 opensim-SC-9d60b84f7805b78ae9413b4dc66c2fbbf387e503.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/EstateSettings.cs
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 f4de93e..73131e6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -244,6 +244,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 244 | void llLoopSound(string sound, double volume); | 244 | void llLoopSound(string sound, double volume); |
| 245 | void llLoopSoundMaster(string sound, double volume); | 245 | void llLoopSoundMaster(string sound, double volume); |
| 246 | void llLoopSoundSlave(string sound, double volume); | 246 | void llLoopSoundSlave(string sound, double volume); |
| 247 | LSL_Integer llManageEstateAccess(int action, string avatar); | ||
| 247 | void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); | 248 | void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); |
| 248 | void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); | 249 | void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset); |
| 249 | void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset); | 250 | void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset); |