diff options
author | Justin Clark-Casey (justincc) | 2010-10-19 02:08:50 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-19 02:08:50 +0100 |
commit | 99388ce6101ff5b2a2c269a2d6cce0b0375f1136 (patch) | |
tree | a35030eea96f2340bed155fa6f842d8854625cc0 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |
parent | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC grou... (diff) | |
parent | Comment a spammy debug message in the serializer (diff) | |
download | opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.zip opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.tar.gz opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.tar.bz2 opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 78ee43c..630821b 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 | } |