aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-20 07:47:20 +0000
committerMelanie Thielker2008-10-20 07:47:20 +0000
commitcaf10245af091498147cf707d30b34cef6ab588b (patch)
treed9a5fa8a4255cc21005aef5e1ee0344f1dc95f6a
parentThank you kindly, Idb for a patch that solves: (diff)
downloadopensim-SC-caf10245af091498147cf707d30b34cef6ab588b.zip
opensim-SC-caf10245af091498147cf707d30b34cef6ab588b.tar.gz
opensim-SC-caf10245af091498147cf707d30b34cef6ab588b.tar.bz2
opensim-SC-caf10245af091498147cf707d30b34cef6ab588b.tar.xz
Mantis #2438
Fix llSetVehicleFloatParam to accept LSL_Float
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs2
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 2f5337f..b3f7ba7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5314,7 +5314,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5314 5314
5315 //CFK 9/28: Most, but not all of the underlying plumbing between here and the physics modules is in 5315 //CFK 9/28: Most, but not all of the underlying plumbing between here and the physics modules is in
5316 //CFK 9/28: so these are not complete yet. 5316 //CFK 9/28: so these are not complete yet.
5317 public void llSetVehicleFloatParam(int param, float value) 5317 public void llSetVehicleFloatParam(int param, LSL_Float value)
5318 { 5318 {
5319 m_host.AddScriptLPS(1); 5319 m_host.AddScriptLPS(1);
5320 5320
@@ -5322,7 +5322,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5322 { 5322 {
5323 if (m_host.ParentGroup.RootPart != null) 5323 if (m_host.ParentGroup.RootPart != null)
5324 { 5324 {
5325 m_host.ParentGroup.RootPart.SetVehicleFloatParam(param, value); 5325 m_host.ParentGroup.RootPart.SetVehicleFloatParam(param, (float)value);
5326 } 5326 }
5327 } 5327 }
5328 } 5328 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 5670988..6ca254a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -339,7 +339,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
339 void llSetTorque(LSL_Vector torque, int local); 339 void llSetTorque(LSL_Vector torque, int local);
340 void llSetTouchText(string text); 340 void llSetTouchText(string text);
341 void llSetVehicleFlags(int flags); 341 void llSetVehicleFlags(int flags);
342 void llSetVehicleFloatParam(int param, float value); 342 void llSetVehicleFloatParam(int param, LSL_Float value);
343 void llSetVehicleRotationParam(int param, LSL_Rotation rot); 343 void llSetVehicleRotationParam(int param, LSL_Rotation rot);
344 void llSetVehicleType(int type); 344 void llSetVehicleType(int type);
345 void llSetVehicleVectorParam(int param, LSL_Vector vec); 345 void llSetVehicleVectorParam(int param, LSL_Vector vec);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 52916b5..78a183f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1554,7 +1554,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1554 m_LSL_Functions.llSetVehicleFlags(flags); 1554 m_LSL_Functions.llSetVehicleFlags(flags);
1555 } 1555 }
1556 1556
1557 public void llSetVehicleFloatParam(int param, float value) 1557 public void llSetVehicleFloatParam(int param, LSL_Float value)
1558 { 1558 {
1559 m_LSL_Functions.llSetVehicleFloatParam(param, value); 1559 m_LSL_Functions.llSetVehicleFloatParam(param, value);
1560 } 1560 }