diff options
| author | Melanie | 2012-08-25 18:19:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-25 18:19:51 +0100 |
| commit | 1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c (patch) | |
| tree | b55dd23e7f33b2c839abfa6d1dd1af5153325fe3 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster (diff) | |
| download | opensim-SC-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.zip opensim-SC-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.tar.gz opensim-SC-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.tar.bz2 opensim-SC-1eb1c1bd4bc972e2df301b9dafb40fbb2f37b40c.tar.xz | |
renaming to be similar to equivalent Set command
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')
| -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 af35258..e08328f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 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); |
| 433 | LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules); | ||
| 434 | 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); | ||
| 435 | } | 435 | } |
| 436 | } | 436 | } |