ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
root
2011-06-30 00:26:03 +01:00
parent 1b7fec0842 c84a1bd99f
commit 5f927dc104
27 changed files with 558 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
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();
}
// Not yet plugged in as available OSSL functions, so commented out
// void osSetWindParam(string plugin, string param, float value)
// {
// m_OSSL_Functions.osSetWindParam(plugin, param, value);
// }
//
// float osGetWindParam(string plugin, string param)
// {
// return m_OSSL_Functions.osGetWindParam(plugin, param);
// }
public void osSetWindParam(string plugin, string param, LSL_Float value)
{
m_OSSL_Functions.osSetWindParam(plugin, param, value);
}
public LSL_Float osGetWindParam(string plugin, string param)
{
return m_OSSL_Functions.osGetWindParam(plugin, param);
}
public void osParcelJoin(vector pos1, vector pos2)
{
@@ -714,7 +713,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osKickAvatar(FirstName, SurName, alert);
}
public void osSetSpeed(string UUID, float SpeedModifier)
public void osSetSpeed(string UUID, LSL_Float SpeedModifier)
{
m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
}