aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-09-26 14:17:01 +0100
committerUbitUmarov2014-09-26 14:17:01 +0100
commitfcad64209c29c55cbec78ae94f221120e9956ebf (patch)
tree2091b02965fabf2688d647cb3675e782f46a8a63 /OpenSim
parent use central animationset permitions define (diff)
downloadopensim-SC_OLD-fcad64209c29c55cbec78ae94f221120e9956ebf.zip
opensim-SC_OLD-fcad64209c29c55cbec78ae94f221120e9956ebf.tar.gz
opensim-SC_OLD-fcad64209c29c55cbec78ae94f221120e9956ebf.tar.bz2
opensim-SC_OLD-fcad64209c29c55cbec78ae94f221120e9956ebf.tar.xz
make c# more happy
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AnimationSet.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs5
2 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Framework/AnimationSet.cs b/OpenSim/Framework/AnimationSet.cs
index 3f6987a..f91838e 100644
--- a/OpenSim/Framework/AnimationSet.cs
+++ b/OpenSim/Framework/AnimationSet.cs
@@ -40,12 +40,12 @@ namespace OpenSim.Framework
40 40
41 public const uint allowedPermitions = (uint)(PermissionMask.Copy | PermissionMask.Modify); 41 public const uint allowedPermitions = (uint)(PermissionMask.Copy | PermissionMask.Modify);
42 42
43 public uint enforcePermitions(uint currentPerm) 43 public static uint enforcePermition(uint currentPerm)
44 { 44 {
45 return currentPerm & allowedPermitions; 45 return currentPerm & allowedPermitions;
46 } 46 }
47 47
48 public void enforceItemPermitions(ref InventoryItemBase it) 48 public static void enforceItemPermitions(ref InventoryItemBase it)
49 { 49 {
50 if (it == null) 50 if (it == null)
51 return; 51 return;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index a32593a..a31532b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -1125,10 +1125,7 @@ namespace OpenSim.Region.ClientStack.Linden
1125 1125
1126 if (inType == (sbyte)CustomInventoryType.AnimationSet) 1126 if (inType == (sbyte)CustomInventoryType.AnimationSet)
1127 { 1127 {
1128 item.BasePermissions = AnimationSet.allowedPermitions; 1128 AnimationSet.enforceItemPermitions(ref item);
1129 item.CurrentPermissions = AnimationSet.allowedPermitions;
1130 item.EveryOnePermissions = 0;
1131 item.NextPermissions = 0;
1132 } 1129 }
1133 1130
1134 else if (restrictPerms) 1131 else if (restrictPerms)