diff options
| author | Melanie | 2010-10-18 20:30:46 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-18 20:30:46 +0100 |
| commit | bb7a755cba628a24bb339ed0aa974ac0ee5503d1 (patch) | |
| tree | b1c7fd32711dd46b7080643c6a6900f3fe827cce /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Alphabetize results on region search by prefix matching (diff) | |
| download | opensim-SC-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.zip opensim-SC-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.tar.gz opensim-SC-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.tar.bz2 opensim-SC-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 3 |
1 files changed, 3 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 c8f3623..fbf601a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -176,6 +176,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 176 | void osCauseDamage(string avatar, double damage); | 176 | void osCauseDamage(string avatar, double damage); |
| 177 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); | 177 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); |
| 178 | void osSetPrimitiveParams(LSL_Key prim, LSL_List rules); | 178 | void osSetPrimitiveParams(LSL_Key prim, LSL_List rules); |
| 179 | void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb); | ||
| 180 | void osSetProjectionParams(LSL_Key prim, bool projection, LSL_Key texture, double fov, double focus, double amb); | ||
| 181 | |||
| 179 | LSL_List osGetAvatarList(); | 182 | LSL_List osGetAvatarList(); |
| 180 | 183 | ||
| 181 | } | 184 | } |