Merge branch 'master' into careminster

2026-08-11 20:05:33 +08:00 · 2012-08-24 01:22:44 +01:00
parent 7fca69222b 82b23f7cc1
commit 7cdb564fdd
4 changed files with 21 additions and 1 deletions
--- 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
        {
            m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
        }
-        
+
+        public LSL_Float osGetHealth(string avatar)
+        {
+            return m_OSSL_Functions.osGetHealth(avatar);
+        }
+
        public void osCauseDamage(string avatar, double damage)
        {
            m_OSSL_Functions.osCauseDamage(avatar, damage);