diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 6f3677c..4fc8d65 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); |
@@ -1535,6 +1530,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1535 | m_LSL_Functions.llSetColor(color, face); | 1530 | m_LSL_Functions.llSetColor(color, face); |
1536 | } | 1531 | } |
1537 | 1532 | ||
1533 | public void llSetContentType(LSL_Key id, LSL_Integer type) | ||
1534 | { | ||
1535 | m_LSL_Functions.llSetContentType(id, type); | ||
1536 | } | ||
1537 | |||
1538 | public void llSetDamage(double damage) | 1538 | public void llSetDamage(double damage) |
1539 | { | 1539 | { |
1540 | m_LSL_Functions.llSetDamage(damage); | 1540 | m_LSL_Functions.llSetDamage(damage); |
@@ -1550,6 +1550,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1550 | m_LSL_Functions.llSetForceAndTorque(force, torque, local); | 1550 | m_LSL_Functions.llSetForceAndTorque(force, torque, local); |
1551 | } | 1551 | } |
1552 | 1552 | ||
1553 | public void llSetAngularVelocity(LSL_Vector force, int local) | ||
1554 | { | ||
1555 | m_LSL_Functions.llSetAngularVelocity(force, local); | ||
1556 | } | ||
1557 | |||
1553 | public void llSetHoverHeight(double height, int water, double tau) | 1558 | public void llSetHoverHeight(double height, int water, double tau) |
1554 | { | 1559 | { |
1555 | m_LSL_Functions.llSetHoverHeight(height, water, tau); | 1560 | m_LSL_Functions.llSetHoverHeight(height, water, tau); |
@@ -1740,11 +1745,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1740 | m_LSL_Functions.llSetVehicleVectorParam(param, vec); | 1745 | m_LSL_Functions.llSetVehicleVectorParam(param, vec); |
1741 | } | 1746 | } |
1742 | 1747 | ||
1743 | public void llSetVelocity(LSL_Vector velocity, int local) | ||
1744 | { | ||
1745 | m_LSL_Functions.llSetVelocity(velocity, local); | ||
1746 | } | ||
1747 | |||
1748 | public void llShout(int channelID, string text) | 1748 | public void llShout(int channelID, string text) |
1749 | { | 1749 | { |
1750 | m_LSL_Functions.llShout(channelID, text); | 1750 | m_LSL_Functions.llShout(channelID, text); |
@@ -2014,10 +2014,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
2014 | { | 2014 | { |
2015 | return m_LSL_Functions.llGetPhysicsMaterial(); | 2015 | return m_LSL_Functions.llGetPhysicsMaterial(); |
2016 | } | 2016 | } |
2017 | |||
2018 | public void llSetContentType(LSL_Key id, LSL_Integer content_type) | ||
2019 | { | ||
2020 | m_LSL_Functions.llSetContentType(id, content_type); | ||
2021 | } | ||
2022 | } | 2017 | } |
2023 | } | 2018 | } |