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 | |
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
4 files changed, 21 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 1309623..574c9af 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1986,6 +1986,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1986 | // If child prims have invalid perms, fix them | 1986 | // If child prims have invalid perms, fix them |
1987 | grp.AdjustChildPrimPermissions(); | 1987 | grp.AdjustChildPrimPermissions(); |
1988 | 1988 | ||
1989 | // If child prims have invalid perms, fix them | ||
1990 | grp.AdjustChildPrimPermissions(); | ||
1991 | |||
1989 | if (remoteClient == null) | 1992 | if (remoteClient == null) |
1990 | { | 1993 | { |
1991 | // Autoreturn has a null client. Nothing else does. So | 1994 | // Autoreturn has a null client. Nothing else does. So |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 04c3184..a81c39c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2943,6 +2943,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2943 | } | 2943 | } |
2944 | }); | 2944 | }); |
2945 | } | 2945 | } |
2946 | |||
2947 | public LSL_Float osGetHealth(string avatar) | ||
2948 | { | ||
2949 | CheckThreatLevel(ThreatLevel.None, "osGetHealth"); | ||
2950 | m_host.AddScriptLPS(1); | ||
2951 | |||
2952 | LSL_Float health = new LSL_Float(-1); | ||
2953 | ScenePresence presence = World.GetScenePresence(new UUID(avatar)); | ||
2954 | if (presence != null) health = presence.Health; | ||
2955 | return health; | ||
2956 | } | ||
2946 | 2957 | ||
2947 | public void osCauseDamage(string avatar, double damage) | 2958 | public void osCauseDamage(string avatar, double damage) |
2948 | { | 2959 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 8c34ed3..8101da5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -258,6 +258,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
258 | int osGetSimulatorMemory(); | 258 | int osGetSimulatorMemory(); |
259 | void osKickAvatar(string FirstName,string SurName,string alert); | 259 | void osKickAvatar(string FirstName,string SurName,string alert); |
260 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); | 260 | void osSetSpeed(string UUID, LSL_Float SpeedModifier); |
261 | LSL_Float osGetHealth(string avatar); | ||
261 | void osCauseHealing(string avatar, double healing); | 262 | void osCauseHealing(string avatar, double healing); |
262 | void osCauseDamage(string avatar, double damage); | 263 | void osCauseDamage(string avatar, double damage); |
263 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); | 264 | LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); |
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); |