Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-08-24 01:22:44 +01:00
4 changed files with 21 additions and 1 deletions

View File

@@ -2943,6 +2943,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
});
}
public LSL_Float osGetHealth(string avatar)
{
CheckThreatLevel(ThreatLevel.None, "osGetHealth");
m_host.AddScriptLPS(1);
LSL_Float health = new LSL_Float(-1);
ScenePresence presence = World.GetScenePresence(new UUID(avatar));
if (presence != null) health = presence.Health;
return health;
}
public void osCauseDamage(string avatar, double damage)
{