diff options
author | Makopoppo | 2011-06-28 22:21:53 +0900 |
---|---|---|
committer | BlueWall | 2011-06-28 11:48:28 -0400 |
commit | 80010f89085af9517e26af01dfe7cbc99788aa31 (patch) | |
tree | ebeec16b3f12e489e0430a2c7fc2ba5a127b8131 /OpenSim/Region/ScriptEngine/Shared | |
parent | [PATCH] Get osGetWindParam() and osSetWindParam() accessible (diff) | |
download | opensim-SC_OLD-80010f89085af9517e26af01dfe7cbc99788aa31.zip opensim-SC_OLD-80010f89085af9517e26af01dfe7cbc99788aa31.tar.gz opensim-SC_OLD-80010f89085af9517e26af01dfe7cbc99788aa31.tar.bz2 opensim-SC_OLD-80010f89085af9517e26af01dfe7cbc99788aa31.tar.xz |
[PATCH] osSetSpeed() will accept float number
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index f32ecca..b098f09 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2209,12 +2209,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2209 | return (int)pws; | 2209 | return (int)pws; |
2210 | } | 2210 | } |
2211 | 2211 | ||
2212 | public void osSetSpeed(string UUID, float SpeedModifier) | 2212 | public void osSetSpeed(string UUID, LSL_Float SpeedModifier) |
2213 | { | 2213 | { |
2214 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); | 2214 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); |
2215 | m_host.AddScriptLPS(1); | 2215 | m_host.AddScriptLPS(1); |
2216 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); | 2216 | ScenePresence avatar = World.GetScenePresence(new UUID(UUID)); |
2217 | avatar.SpeedModifier = SpeedModifier; | 2217 | avatar.SpeedModifier = (float)SpeedModifier; |
2218 | } | 2218 | } |
2219 | 2219 | ||
2220 | public void osKickAvatar(string FirstName,string SurName,string alert) | 2220 | public void osKickAvatar(string FirstName,string SurName,string alert) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 7227b40..19352f0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -180,7 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
180 | 180 | ||
181 | int osGetSimulatorMemory(); | 181 | int osGetSimulatorMemory(); |
182 | void osKickAvatar(string FirstName,string SurName,string alert); | 182 | void osKickAvatar(string FirstName,string SurName,string alert); |
183 | void osSetSpeed(string UUID, float SpeedModifier); | 183 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); |
184 | void osCauseHealing(string avatar, double healing); | 184 | void osCauseHealing(string avatar, double healing); |
185 | void osCauseDamage(string avatar, double damage); | 185 | void osCauseDamage(string avatar, double damage); |
186 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); | 186 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index f5bdc68..7c59098 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -713,7 +713,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
713 | m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); | 713 | m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert); |
714 | } | 714 | } |
715 | 715 | ||
716 | public void osSetSpeed(string UUID, float SpeedModifier) | 716 | public void osSetSpeed(string UUID, LSL_Float SpeedModifier) |
717 | { | 717 | { |
718 | m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); | 718 | m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); |
719 | } | 719 | } |