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/Implementation | |
| 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/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ad7fc6c..45bdb41 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -8849,10 +8849,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8849 | } | 8849 | } |
| 8850 | 8850 | ||
| 8851 | public void llSetPhysicsMaterial(int material_bits, | 8851 | public void llSetPhysicsMaterial(int material_bits, |
| 8852 | float material_gravity_modifier, float material_restitution, | 8852 | LSL_Float material_gravity_modifier, LSL_Float material_restitution, |
| 8853 | float material_friction, float material_density) | 8853 | LSL_Float material_friction, LSL_Float material_density) |
| 8854 | { | 8854 | { |
| 8855 | SetPhysicsMaterial(m_host, material_bits, material_density, material_friction, material_restitution, material_gravity_modifier); | 8855 | SetPhysicsMaterial(m_host, material_bits, (float)material_density, (float)material_friction, (float)material_restitution, (float)material_gravity_modifier); |
| 8856 | } | 8856 | } |
| 8857 | 8857 | ||
| 8858 | // vector up using libomv (c&p from sop ) | 8858 | // vector up using libomv (c&p from sop ) |