OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Get osGetWindParam() and osSetWindParam() accessible 

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
bulletsim
Makopoppo 2011-06-27 19:30:42 +09:00 committed by BlueWall
parent 882d5c82b3
commit ffa790d69d
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1241,7 +1241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return String.Empty; return String.Empty;
} }
public void osSetWindParam(string plugin, string param, float value) public void osSetWindParam(string plugin, string param, LSL_Float value)
{ {
CheckThreatLevel(ThreatLevel.VeryLow, "osSetWindParam"); CheckThreatLevel(ThreatLevel.VeryLow, "osSetWindParam");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
@ -1251,13 +1251,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
try try
{ {
module.WindParamSet(plugin, param, value); module.WindParamSet(plugin, param, (float)value);
} }
catch (Exception) { } catch (Exception) { }
} }
} }
public float osGetWindParam(string plugin, string param) public LSL_Float osGetWindParam(string plugin, string param)
{ {
CheckThreatLevel(ThreatLevel.VeryLow, "osGetWindParam"); CheckThreatLevel(ThreatLevel.VeryLow, "osGetWindParam");
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);

4
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -129,8 +129,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
// Wind Module Functions // Wind Module Functions
string osWindActiveModelPluginName(); string osWindActiveModelPluginName();
void osSetWindParam(string plugin, string param, float value); void osSetWindParam(string plugin, string param, LSL_Float value);
float osGetWindParam(string plugin, string param); LSL_Float osGetWindParam(string plugin, string param);
// Parcel commands // Parcel commands
void osParcelJoin(vector pos1, vector pos2); void osParcelJoin(vector pos1, vector pos2);

19
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -106,16 +106,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osWindActiveModelPluginName(); return m_OSSL_Functions.osWindActiveModelPluginName();
} }
// Not yet plugged in as available OSSL functions, so commented out public void osSetWindParam(string plugin, string param, LSL_Float value)
// void osSetWindParam(string plugin, string param, float value) {
// { m_OSSL_Functions.osSetWindParam(plugin, param, value);
// m_OSSL_Functions.osSetWindParam(plugin, param, value); }
// }
// public LSL_Float osGetWindParam(string plugin, string param)
// float osGetWindParam(string plugin, string param) {
// { return m_OSSL_Functions.osGetWindParam(plugin, param);
// return m_OSSL_Functions.osGetWindParam(plugin, param); }
// }
public void osParcelJoin(vector pos1, vector pos2) public void osParcelJoin(vector pos1, vector pos2)
{ {