diff options
author | UbitUmarov | 2017-01-08 11:15:39 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-08 11:15:39 +0000 |
commit | fb42845bee508e5d411af78263262fe5fd677d82 (patch) | |
tree | 49122f7e8e153f9aae501b5e436ac305d682ac3f /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | add the new GOD ossl option to osslEnable.ini (diff) | |
download | opensim-SC_OLD-fb42845bee508e5d411af78263262fe5fd677d82.zip opensim-SC_OLD-fb42845bee508e5d411af78263262fe5fd677d82.tar.gz opensim-SC_OLD-fb42845bee508e5d411af78263262fe5fd677d82.tar.bz2 opensim-SC_OLD-fb42845bee508e5d411af78263262fe5fd677d82.tar.xz |
mantis 8117: fix llSetPhysicsMaterial, using proper LSL_float type
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 1a42c3a..8d8ec08 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -2036,9 +2036,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
2036 | m_LSL_Functions.llSetKeyframedMotion(frames, options); | 2036 | m_LSL_Functions.llSetKeyframedMotion(frames, options); |
2037 | } | 2037 | } |
2038 | 2038 | ||
2039 | public void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density) | 2039 | public void llSetPhysicsMaterial(int material, LSL_Float material_gravity_modifier, LSL_Float material_restitution, LSL_Float material_friction, LSL_Float material_density) |
2040 | { | 2040 | { |
2041 | m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density); | 2041 | m_LSL_Functions.llSetPhysicsMaterial(material, material_gravity_modifier, material_restitution, material_friction, material_density); |
2042 | } | 2042 | } |
2043 | 2043 | ||
2044 | public LSL_List llGetPhysicsMaterial() | 2044 | public LSL_List llGetPhysicsMaterial() |