diff options
author | Melanie Thielker | 2014-09-09 05:20:53 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-09-09 05:20:53 +0200 |
commit | 347c5b3070f7ce6ecc2a617e09fd02e4616061ba (patch) | |
tree | c027d3d3e9a1f86fac4b290f2702324c5b941e01 /OpenSim | |
parent | Add some forgotten calls (diff) | |
download | opensim-SC_OLD-347c5b3070f7ce6ecc2a617e09fd02e4616061ba.zip opensim-SC_OLD-347c5b3070f7ce6ecc2a617e09fd02e4616061ba.tar.gz opensim-SC_OLD-347c5b3070f7ce6ecc2a617e09fd02e4616061ba.tar.bz2 opensim-SC_OLD-347c5b3070f7ce6ecc2a617e09fd02e4616061ba.tar.xz |
Add perms check
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs index 04dccc8..f77d29a 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 | |||
49 | { | 49 | { |
50 | public class MovementAnimationOverrides | 50 | public class MovementAnimationOverrides |
51 | { | 51 | { |
52 | private static readonly ILog m_log = | ||
53 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
54 | |||
52 | private Dictionary<string, UUID> m_overrides = new Dictionary<string, UUID>(); | 55 | private Dictionary<string, UUID> m_overrides = new Dictionary<string, UUID>(); |
53 | public void SetOverride(string state, UUID animID) | 56 | public void SetOverride(string state, UUID animID) |
54 | { | 57 | { |
@@ -58,6 +61,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
58 | return; | 61 | return; |
59 | } | 62 | } |
60 | 63 | ||
64 | m_log.DebugFormat("Setting override for {0} to {1}", state, animID); | ||
65 | |||
61 | lock (m_overrides) | 66 | lock (m_overrides) |
62 | m_overrides[state] = animID; | 67 | m_overrides[state] = animID; |
63 | } | 68 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 29e526d..1536959 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 | |||
13497 | } | 13497 | } |
13498 | 13498 | ||
13499 | if (m_item.PermsGranter == UUID.Zero) | 13499 | if (m_item.PermsGranter == UUID.Zero) |
13500 | { | ||
13501 | llShout(ScriptBaseClass.DEBUG_CHANNEL, "No permission to override animations"); | ||
13500 | return; | 13502 | return; |
13503 | } | ||
13501 | 13504 | ||
13502 | if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_OVERRIDE_ANIMATIONS) == 0) | 13505 | if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_OVERRIDE_ANIMATIONS) == 0) |
13503 | { | 13506 | { |