aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-01-08 11:15:39 +0000
committerUbitUmarov2017-01-08 11:15:39 +0000
commitfb42845bee508e5d411af78263262fe5fd677d82 (patch)
tree49122f7e8e153f9aae501b5e436ac305d682ac3f /OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
parentadd the new GOD ossl option to osslEnable.ini (diff)
downloadopensim-SC-fb42845bee508e5d411af78263262fe5fd677d82.zip
opensim-SC-fb42845bee508e5d411af78263262fe5fd677d82.tar.gz
opensim-SC-fb42845bee508e5d411af78263262fe5fd677d82.tar.bz2
opensim-SC-fb42845bee508e5d411af78263262fe5fd677d82.tar.xz
mantis 8117: fix llSetPhysicsMaterial, using proper LSL_float type
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs2
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 cc52403..9766f77 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -434,7 +434,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
434 LSL_String llXorBase64Strings(string str1, string str2); 434 LSL_String llXorBase64Strings(string str1, string str2);
435 LSL_String llXorBase64StringsCorrect(string str1, string str2); 435 LSL_String llXorBase64StringsCorrect(string str1, string str2);
436 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link); 436 LSL_Integer llGetLinkNumberOfSides(LSL_Integer link);
437 void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density); 437 void llSetPhysicsMaterial(int material, LSL_Float material_gravity_modifier, LSL_Float material_restitution, LSL_Float material_friction, LSL_Float material_density);
438 438
439 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc); 439 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
440 void llSetKeyframedMotion(LSL_List frames, LSL_List options); 440 void llSetKeyframedMotion(LSL_List frames, LSL_List options);