diff options
author | Melanie | 2012-08-24 01:22:44 +0100 |
---|---|---|
committer | Melanie | 2012-08-24 01:22:44 +0100 |
commit | 7cdb564fdd1b75f674a572d5484473cc33145891 (patch) | |
tree | 048c59aafd1faf45ce13a2b7ec9bad0024e1d9f6 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.zip opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.tar.gz opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.tar.bz2 opensim-SC_OLD-7cdb564fdd1b75f674a572d5484473cc33145891.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 94405d2..e9131e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -865,7 +865,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
865 | { | 865 | { |
866 | m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); | 866 | m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier); |
867 | } | 867 | } |
868 | 868 | ||
869 | public LSL_Float osGetHealth(string avatar) | ||
870 | { | ||
871 | return m_OSSL_Functions.osGetHealth(avatar); | ||
872 | } | ||
873 | |||
869 | public void osCauseDamage(string avatar, double damage) | 874 | public void osCauseDamage(string avatar, double damage) |
870 | { | 875 | { |
871 | m_OSSL_Functions.osCauseDamage(avatar, damage); | 876 | m_OSSL_Functions.osCauseDamage(avatar, damage); |