diff options
| author | Melanie | 2012-08-24 01:22:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-24 01:22:44 +0100 |
| commit | 7cdb564fdd1b75f674a572d5484473cc33145891 (patch) | |
| tree | 048c59aafd1faf45ce13a2b7ec9bad0024e1d9f6 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.zip opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.tar.gz opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.tar.bz2 opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.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 | 1 |
1 files changed, 1 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 8c34ed3..8101da5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -258,6 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 258 | int osGetSimulatorMemory(); | 258 | int osGetSimulatorMemory(); |
| 259 | void osKickAvatar(string FirstName,string SurName,string alert); | 259 | void osKickAvatar(string FirstName,string SurName,string alert); |
| 260 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); | 260 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); |
| 261 | LSL_Float osGetHealth(string avatar); | ||
| 261 | void osCauseHealing(string avatar, double healing); | 262 | void osCauseHealing(string avatar, double healing); |
| 262 | void osCauseDamage(string avatar, double damage); | 263 | void osCauseDamage(string avatar, double damage); |
| 263 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); | 264 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); |