From 347c5b3070f7ce6ecc2a617e09fd02e4616061ba Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Tue, 9 Sep 2014 05:20:53 +0200 Subject: [PATCH] Add perms check --- .../Framework/Scenes/Animation/MovementAnimationOverrides.cs | 5 +++++ .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs index 04dccc8e25..f77d29a2a0 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs @@ -49,6 +49,9 @@ namespace OpenSim.Region.Framework.Scenes { public class MovementAnimationOverrides { + private static readonly ILog m_log = + LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private Dictionary m_overrides = new Dictionary(); public void SetOverride(string state, UUID animID) { @@ -58,6 +61,8 @@ namespace OpenSim.Region.Framework.Scenes return; } + m_log.DebugFormat("Setting override for {0} to {1}", state, animID); + lock (m_overrides) m_overrides[state] = animID; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 29e526d243..1536959749 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -13497,7 +13497,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } if (m_item.PermsGranter == UUID.Zero) + { + llShout(ScriptBaseClass.DEBUG_CHANNEL, "No permission to override animations"); return; + } if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_OVERRIDE_ANIMATIONS) == 0) {