aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-05-04 00:44:47 +0200
committerMelanie2013-05-04 00:44:47 +0200
commit4904d4013803b0128c52b2f9bdd5e94972b05c2f (patch)
tree83a8c0c83b64e1b94e31f203b16724dfab3f1b54
parentFix the long standing bug of items being delivered to lost and found or trash... (diff)
downloadopensim-SC_OLD-4904d4013803b0128c52b2f9bdd5e94972b05c2f.zip
opensim-SC_OLD-4904d4013803b0128c52b2f9bdd5e94972b05c2f.tar.gz
opensim-SC_OLD-4904d4013803b0128c52b2f9bdd5e94972b05c2f.tar.bz2
opensim-SC_OLD-4904d4013803b0128c52b2f9bdd5e94972b05c2f.tar.xz
Add llGetPhysicsMaterial
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs5
3 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index bc35272..bb89ac1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7851,6 +7851,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7851 } 7851 }
7852 } 7852 }
7853 7853
7854 public LSL_List llGetPhysicsMaterial()
7855 {
7856 LSL_List result = new LSL_List();
7857
7858 result.Add(new LSL_Float(m_host.GravityModifier));
7859 result.Add(new LSL_Float(m_host.Restitution));
7860 result.Add(new LSL_Float(m_host.Friction));
7861 result.Add(new LSL_Float(m_host.Density));
7862
7863 return result;
7864 }
7865
7854 private void SetPhysicsMaterial(SceneObjectPart part, int material_bits, 7866 private void SetPhysicsMaterial(SceneObjectPart part, int material_bits,
7855 float material_density, float material_friction, 7867 float material_density, float material_friction,
7856 float material_restitution, float material_gravity_modifier) 7868 float material_restitution, float material_gravity_modifier)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 9bf6f9b..bc8d321 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -433,5 +433,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
433 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc); 433 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
434 void llSetKeyframedMotion(LSL_List frames, LSL_List options); 434 void llSetKeyframedMotion(LSL_List frames, LSL_List options);
435 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 435 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
436 LSL_List llGetPhysicsMaterial();
436 } 437 }
437} 438}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 8ecc4f8..b6bb5d8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -2009,5 +2009,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
2009 { 2009 {
2010 m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density); 2010 m_LSL_Functions.llSetPhysicsMaterial(material_bits, material_gravity_modifier, material_restitution, material_friction, material_density);
2011 } 2011 }
2012
2013 public LSL_List llGetPhysicsMaterial()
2014 {
2015 return m_LSL_Functions.llGetPhysicsMaterial();
2016 }
2012 } 2017 }
2013} 2018}