Merge branch 'ubitworkmaster'

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
         /// <param name="mainPerms">The permissions variable to modify.</param>
         public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms)
         {
-            if ((foldedPerms & 7) == 0)
-                return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded
+//            if ((foldedPerms & 7) == 0)
+//                return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded
 
             if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0)
                 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
             int itemmax = 21;
             WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
             for (uint i=0;i<itemmax;i++)
-                retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i + 1};
+                retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i};
             return retitems;
         }
         public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache)