diff options
| author | Dan Lake | 2011-07-11 12:23:20 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-11 12:23:20 -0700 |
| commit | b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch) | |
| tree | 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Checkin 32 bit bulletsim shared library for Linux. (diff) | |
| parent | minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff) | |
| download | opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 63007c6..19352f0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -129,8 +129,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 129 | 129 | ||
| 130 | // Wind Module Functions | 130 | // Wind Module Functions |
| 131 | string osWindActiveModelPluginName(); | 131 | string osWindActiveModelPluginName(); |
| 132 | void osSetWindParam(string plugin, string param, float value); | 132 | void osSetWindParam(string plugin, string param, LSL_Float value); |
| 133 | float osGetWindParam(string plugin, string param); | 133 | LSL_Float osGetWindParam(string plugin, string param); |
| 134 | 134 | ||
| 135 | // Parcel commands | 135 | // Parcel commands |
| 136 | void osParcelJoin(vector pos1, vector pos2); | 136 | void osParcelJoin(vector pos1, vector pos2); |
| @@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 180 | 180 | ||
| 181 | int osGetSimulatorMemory(); | 181 | int osGetSimulatorMemory(); |
| 182 | void osKickAvatar(string FirstName,string SurName,string alert); | 182 | void osKickAvatar(string FirstName,string SurName,string alert); |
| 183 | void osSetSpeed(string UUID, float SpeedModifier); | 183 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); |
| 184 | void osCauseHealing(string avatar, double healing); | 184 | void osCauseHealing(string avatar, double healing); |
| 185 | void osCauseDamage(string avatar, double damage); | 185 | void osCauseDamage(string avatar, double damage); |
| 186 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); | 186 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); |