diff options
author | Melanie | 2013-07-13 00:47:58 +0100 |
---|---|---|
committer | Melanie | 2013-07-13 00:47:58 +0100 |
commit | a53a10ad270ea02e57aca7787d0b8278989eea68 (patch) | |
tree | 7ff1b6d170e828e8b9628ef13078b2cd0ecbd8b6 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Centralize duplicated code in SceneObjectPart for subscribing to (diff) | |
download | opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.zip opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.gz opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.bz2 opensim-SC_OLD-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index b58686b..2f528af 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -1495,11 +1495,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1495 | m_LSL_Functions.llSetAlpha(alpha, face); | 1495 | m_LSL_Functions.llSetAlpha(alpha, face); |
1496 | } | 1496 | } |
1497 | 1497 | ||
1498 | public void llSetAngularVelocity(LSL_Vector angvelocity, int local) | ||
1499 | { | ||
1500 | m_LSL_Functions.llSetAngularVelocity(angvelocity, local); | ||
1501 | } | ||
1502 | |||
1503 | public void llSetBuoyancy(double buoyancy) | 1498 | public void llSetBuoyancy(double buoyancy) |
1504 | { | 1499 | { |
1505 | m_LSL_Functions.llSetBuoyancy(buoyancy); | 1500 | m_LSL_Functions.llSetBuoyancy(buoyancy); |
@@ -1555,6 +1550,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1555 | m_LSL_Functions.llSetForceAndTorque(force, torque, local); | 1550 | m_LSL_Functions.llSetForceAndTorque(force, torque, local); |
1556 | } | 1551 | } |
1557 | 1552 | ||
1553 | public void llSetVelocity(LSL_Vector force, int local) | ||
1554 | { | ||
1555 | m_LSL_Functions.llSetVelocity(force, local); | ||
1556 | } | ||
1557 | |||
1558 | public void llSetAngularVelocity(LSL_Vector force, int local) | ||
1559 | { | ||
1560 | m_LSL_Functions.llSetAngularVelocity(force, local); | ||
1561 | } | ||
1562 | |||
1558 | public void llSetHoverHeight(double height, int water, double tau) | 1563 | public void llSetHoverHeight(double height, int water, double tau) |
1559 | { | 1564 | { |
1560 | m_LSL_Functions.llSetHoverHeight(height, water, tau); | 1565 | m_LSL_Functions.llSetHoverHeight(height, water, tau); |
@@ -1745,11 +1750,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1745 | m_LSL_Functions.llSetVehicleVectorParam(param, vec); | 1750 | m_LSL_Functions.llSetVehicleVectorParam(param, vec); |
1746 | } | 1751 | } |
1747 | 1752 | ||
1748 | public void llSetVelocity(LSL_Vector velocity, int local) | ||
1749 | { | ||
1750 | m_LSL_Functions.llSetVelocity(velocity, local); | ||
1751 | } | ||
1752 | |||
1753 | public void llShout(int channelID, string text) | 1753 | public void llShout(int channelID, string text) |
1754 | { | 1754 | { |
1755 | m_LSL_Functions.llShout(channelID, text); | 1755 | m_LSL_Functions.llShout(channelID, text); |