diff options
author | Makopoppo | 2011-06-27 19:30:42 +0900 |
---|---|---|
committer | BlueWall | 2011-06-28 11:48:28 -0400 |
commit | ffa790d69d4e9b1b50470f84b0ad198098dc2736 (patch) | |
tree | 1c7c209681b56815cea65af973f9480aa7d42115 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | [PATCH 1/2] Fixed the function names of some OSSL functions shown as (diff) | |
download | opensim-SC_OLD-ffa790d69d4e9b1b50470f84b0ad198098dc2736.zip opensim-SC_OLD-ffa790d69d4e9b1b50470f84b0ad198098dc2736.tar.gz opensim-SC_OLD-ffa790d69d4e9b1b50470f84b0ad198098dc2736.tar.bz2 opensim-SC_OLD-ffa790d69d4e9b1b50470f84b0ad198098dc2736.tar.xz |
[PATCH] Get osGetWindParam() and osSetWindParam() accessible
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to '')
3 files changed, 14 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 201fef4..f32ecca 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1241,7 +1241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1241 | return String.Empty; | 1241 | return String.Empty; |
1242 | } | 1242 | } |
1243 | 1243 | ||
1244 | public void osSetWindParam(string plugin, string param, float value) | 1244 | public void osSetWindParam(string plugin, string param, LSL_Float value) |
1245 | { | 1245 | { |
1246 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetWindParam"); | 1246 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetWindParam"); |
1247 | m_host.AddScriptLPS(1); | 1247 | m_host.AddScriptLPS(1); |
@@ -1251,13 +1251,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1251 | { | 1251 | { |
1252 | try | 1252 | try |
1253 | { | 1253 | { |
1254 | module.WindParamSet(plugin, param, value); | 1254 | module.WindParamSet(plugin, param, (float)value); |
1255 | } | 1255 | } |
1256 | catch (Exception) { } | 1256 | catch (Exception) { } |
1257 | } | 1257 | } |
1258 | } | 1258 | } |
1259 | 1259 | ||
1260 | public float osGetWindParam(string plugin, string param) | 1260 | public LSL_Float osGetWindParam(string plugin, string param) |
1261 | { | 1261 | { |
1262 | CheckThreatLevel(ThreatLevel.VeryLow, "osGetWindParam"); | 1262 | CheckThreatLevel(ThreatLevel.VeryLow, "osGetWindParam"); |
1263 | m_host.AddScriptLPS(1); | 1263 | m_host.AddScriptLPS(1); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 63007c6..7227b40 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -129,8 +129,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
129 | 129 | ||
130 | // Wind Module Functions | 130 | // Wind Module Functions |
131 | string osWindActiveModelPluginName(); | 131 | string osWindActiveModelPluginName(); |
132 | void osSetWindParam(string plugin, string param, float value); | 132 | void osSetWindParam(string plugin, string param, LSL_Float value); |
133 | float osGetWindParam(string plugin, string param); | 133 | LSL_Float osGetWindParam(string plugin, string param); |
134 | 134 | ||
135 | // Parcel commands | 135 | // Parcel commands |
136 | void osParcelJoin(vector pos1, vector pos2); | 136 | void osParcelJoin(vector pos1, vector pos2); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index e3ea556..f5bdc68 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -106,16 +106,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
106 | return m_OSSL_Functions.osWindActiveModelPluginName(); | 106 | return m_OSSL_Functions.osWindActiveModelPluginName(); |
107 | } | 107 | } |
108 | 108 | ||
109 | // Not yet plugged in as available OSSL functions, so commented out | 109 | public void osSetWindParam(string plugin, string param, LSL_Float value) |
110 | // void osSetWindParam(string plugin, string param, float value) | 110 | { |
111 | // { | 111 | m_OSSL_Functions.osSetWindParam(plugin, param, value); |
112 | // m_OSSL_Functions.osSetWindParam(plugin, param, value); | 112 | } |
113 | // } | 113 | |
114 | // | 114 | public LSL_Float osGetWindParam(string plugin, string param) |
115 | // float osGetWindParam(string plugin, string param) | 115 | { |
116 | // { | 116 | return m_OSSL_Functions.osGetWindParam(plugin, param); |
117 | // return m_OSSL_Functions.osGetWindParam(plugin, param); | 117 | } |
118 | // } | ||
119 | 118 | ||
120 | public void osParcelJoin(vector pos1, vector pos2) | 119 | public void osParcelJoin(vector pos1, vector pos2) |
121 | { | 120 | { |