diff options
| author | Melanie | 2012-08-29 03:31:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-29 03:31:13 +0100 |
| commit | 899337b4a0584ce2371c3bfcc44387d0f090b792 (patch) | |
| tree | 3a3e862951a85889c3c5762d6d30b5dd80868864 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing rule tracking (diff) | |
| download | opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.zip opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2 opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index e08328f..05c20f9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -429,7 +429,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 429 | LSL_Integer llGetLinkNumberOfSides(LSL_Integer link); | 429 | LSL_Integer llGetLinkNumberOfSides(LSL_Integer link); |
| 430 | void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density); | 430 | void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density); |
| 431 | 431 | ||
| 432 | void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | 432 | void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc); |
| 433 | void llSetKeyframedMotion(LSL_List frames, LSL_List options); | 433 | void llSetKeyframedMotion(LSL_List frames, LSL_List options); |
| 434 | LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | 434 | LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); |
| 435 | } | 435 | } |