aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorUbitUmarov2017-01-08 11:28:34 +0000
committerUbitUmarov2017-01-08 11:28:34 +0000
commitda69bc5da6703e8d907c486d65ac60eb68cdb6db (patch)
treeb03f41b67cde04f049885d63adbf9bc7fe059229 /OpenSim/Region/ScriptEngine
parentmantis 8117: fix llSetPhysicsMaterial, using proper LSL_float type (diff)
downloadopensim-SC_OLD-da69bc5da6703e8d907c486d65ac60eb68cdb6db.zip
opensim-SC_OLD-da69bc5da6703e8d907c486d65ac60eb68cdb6db.tar.gz
opensim-SC_OLD-da69bc5da6703e8d907c486d65ac60eb68cdb6db.tar.bz2
opensim-SC_OLD-da69bc5da6703e8d907c486d65ac60eb68cdb6db.tar.xz
restore argument name material_bits
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 9766f77..17c977f 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, LSL_Float material_gravity_modifier, LSL_Float material_restitution, LSL_Float material_friction, LSL_Float material_density); 437 void llSetPhysicsMaterial(int material_bits, 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);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 8d8ec08..c39248b 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, LSL_Float material_gravity_modifier, LSL_Float material_restitution, LSL_Float material_friction, LSL_Float material_density) 2039 public void llSetPhysicsMaterial(int material_bits, 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, material_gravity_modifier, material_restitution, material_friction, material_density); 2041 m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density);
2042 } 2042 }
2043 2043
2044 public LSL_List llGetPhysicsMaterial() 2044 public LSL_List llGetPhysicsMaterial()