diff options
| author | Melanie | 2009-12-31 04:53:05 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-31 04:53:05 +0000 |
| commit | 643cc7a0ee19dd6670d674eca5ed039c652f14bf (patch) | |
| tree | 4ae205fa5e0aad244c7a41b47cf7e3cf147bdb8a /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | [PATCH] Adds llCollisionFilter (diff) | |
| download | opensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.zip opensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.tar.gz opensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.tar.bz2 opensim-SC_OLD-643cc7a0ee19dd6670d674eca5ed039c652f14bf.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index d943b59..5e20f7d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -165,5 +165,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 165 | LSL_List osGetRegionStats(); | 165 | LSL_List osGetRegionStats(); |
| 166 | 166 | ||
| 167 | int osGetSimulatorMemory(); | 167 | int osGetSimulatorMemory(); |
| 168 | void osKickAvatar(string FirstName,string SurName,string alert); | ||
| 169 | void osSetSpeed(string UUID, float SpeedModifier); | ||
| 170 | void osCauseHealing(string avatar, double healing); | ||
| 171 | void osCauseDamage(string avatar, double damage); | ||
| 168 | } | 172 | } |
| 169 | } | 173 | } |