diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/PermissionsUtil.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/WearableCacheItem.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/PermissionsUtil.cs b/OpenSim/Framework/PermissionsUtil.cs index d785a78..5d3186d 100644 --- a/OpenSim/Framework/PermissionsUtil.cs +++ b/OpenSim/Framework/PermissionsUtil.cs | |||
@@ -72,8 +72,8 @@ namespace OpenSim.Framework | |||
72 | /// <param name="mainPerms">The permissions variable to modify.</param> | 72 | /// <param name="mainPerms">The permissions variable to modify.</param> |
73 | public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms) | 73 | public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms) |
74 | { | 74 | { |
75 | if ((foldedPerms & 7) == 0) | 75 | // if ((foldedPerms & 7) == 0) |
76 | return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded | 76 | // return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded |
77 | 77 | ||
78 | if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0) | 78 | if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0) |
79 | mainPerms &= ~(uint)PermissionMask.Copy; | 79 | mainPerms &= ~(uint)PermissionMask.Copy; |
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs index 1aecf79..cde2862 100644 --- a/OpenSim/Framework/WearableCacheItem.cs +++ b/OpenSim/Framework/WearableCacheItem.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Framework | |||
46 | int itemmax = 21; | 46 | int itemmax = 21; |
47 | WearableCacheItem[] retitems = new WearableCacheItem[itemmax]; | 47 | WearableCacheItem[] retitems = new WearableCacheItem[itemmax]; |
48 | for (uint i=0;i<itemmax;i++) | 48 | for (uint i=0;i<itemmax;i++) |
49 | retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i + 1}; | 49 | retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i}; |
50 | return retitems; | 50 | return retitems; |
51 | } | 51 | } |
52 | public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache) | 52 | public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache) |