diff options
author | Melanie | 2012-03-13 22:20:12 +0100 |
---|---|---|
committer | Melanie | 2012-03-13 22:20:12 +0100 |
commit | 838818270785c58d7b2df221b8b94397aa3cdb04 (patch) | |
tree | b695fe9a94e8b1c170c1bb97b6b3873a671e3efa /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | Hook up the new cap to the SOP changes (diff) | |
download | opensim-SC-838818270785c58d7b2df221b8b94397aa3cdb04.zip opensim-SC-838818270785c58d7b2df221b8b94397aa3cdb04.tar.gz opensim-SC-838818270785c58d7b2df221b8b94397aa3cdb04.tar.bz2 opensim-SC-838818270785c58d7b2df221b8b94397aa3cdb04.tar.xz |
Implement llSetPrimitiveParams for physics shape and material. Add
llSetPhysicsMaterial support.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index ba75253..4ce3cf1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -570,6 +570,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
570 | public const int PRIM_MEDIA_PERM_OWNER = 1; | 570 | public const int PRIM_MEDIA_PERM_OWNER = 1; |
571 | public const int PRIM_MEDIA_PERM_GROUP = 2; | 571 | public const int PRIM_MEDIA_PERM_GROUP = 2; |
572 | public const int PRIM_MEDIA_PERM_ANYONE = 4; | 572 | public const int PRIM_MEDIA_PERM_ANYONE = 4; |
573 | |||
574 | public const int PRIM_PHYSICS_SHAPE_TYPE = 30; | ||
575 | public const int PRIM_PHYSICS_SHAPE_PRIM = 0; | ||
576 | public const int PRIM_PHYSICS_SHAPE_CONVEX = 2; | ||
577 | public const int PRIM_PHYSICS_SHAPE_NONE = 1; | ||
578 | |||
579 | public const int PRIM_PHYSICS_MATERIAL = 31; | ||
580 | public const int DENSITY = 1; | ||
581 | public const int FRICTION = 2; | ||
582 | public const int RESTITUTION = 4; | ||
583 | public const int GRAVITY_MULTIPLIER = 8; | ||
573 | 584 | ||
574 | // extra constants for llSetPrimMediaParams | 585 | // extra constants for llSetPrimMediaParams |
575 | public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); | 586 | public static readonly LSLInteger LSL_STATUS_OK = new LSLInteger(0); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index a8d1ddb..bf58d13 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -1949,5 +1949,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1949 | { | 1949 | { |
1950 | m_LSL_Functions.llSetKeyframedMotion(frames, options); | 1950 | m_LSL_Functions.llSetKeyframedMotion(frames, options); |
1951 | } | 1951 | } |
1952 | |||
1953 | public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density) | ||
1954 | { | ||
1955 | m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density); | ||
1956 | } | ||
1952 | } | 1957 | } |
1953 | } | 1958 | } |