OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make c# more happy

avinationmerge
UbitUmarov 2014-09-26 14:17:01 +01:00
parent 5f57b55dc9
commit fcad64209c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/AnimationSet.cs
View File

@ -40,12 +40,12 @@ namespace OpenSim.Framework
public const uint allowedPermitions = (uint)(PermissionMask.Copy | PermissionMask.Modify); public const uint allowedPermitions = (uint)(PermissionMask.Copy | PermissionMask.Modify);
public uint enforcePermitions(uint currentPerm) public static uint enforcePermition(uint currentPerm)
{ {
return currentPerm & allowedPermitions; return currentPerm & allowedPermitions;
} }
public void enforceItemPermitions(ref InventoryItemBase it) public static void enforceItemPermitions(ref InventoryItemBase it)
{ {
if (it == null) if (it == null)
return; return;

5
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -1125,10 +1125,7 @@ namespace OpenSim.Region.ClientStack.Linden
if (inType == (sbyte)CustomInventoryType.AnimationSet) if (inType == (sbyte)CustomInventoryType.AnimationSet)
{ {
item.BasePermissions = AnimationSet.allowedPermitions; AnimationSet.enforceItemPermitions(ref item);
item.CurrentPermissions = AnimationSet.allowedPermitions;
item.EveryOnePermissions = 0;
item.NextPermissions = 0;
} }
else if (restrictPerms) else if (restrictPerms)