5 files changed, 92 insertions, 45 deletions

diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index a34c85f..c384336 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -53,7 +53,11 @@ namespace OpenSim.Framework
         // should be only used as initial default value ( V1 viewers )
         public readonly static int VISUALPARAM_COUNT = 218;
 
-        public readonly static int TEXTURE_COUNT = 21;
+//        public readonly static int TEXTURE_COUNT = 21 
+        // 21 bad, make it be updated as libovm gets update
+        // also keeping in sync with it
+        public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES;
+
         public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
 
         protected int m_serial = 0;
@@ -458,7 +462,10 @@ namespace OpenSim.Framework
 //          m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID);
 // DEBUG OFF
             m_wearables[wearableId].Clear();
-            for (int i = 0; i < wearable.Count; i++)
+            int count = wearable.Count;
+            if (count > AvatarWearable.MAX_WEARABLES)
+                count = AvatarWearable.MAX_WEARABLES;
+            for (int i = 0; i < count; i++)
                 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
         }
 
@@ -751,7 +758,12 @@ namespace OpenSim.Framework
                 if ((data != null) && (data["wearables"] != null) && (data["wearables"]).Type == OSDType.Array)
                 {
                     OSDArray wears = (OSDArray)(data["wearables"]);
-                    for (int i = 0; i < wears.Count; i++)
+
+                    int count = wears.Count;
+                    if (count > AvatarWearable.MAX_WEARABLES)
+                        count = AvatarWearable.MAX_WEARABLES;
+
+                    for (int i = 0; i < count; i++)
                         m_wearables[i] = new AvatarWearable((OSDArray)wears[i]);
                 }
                 else
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index aee295a..2d411e3 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -67,10 +67,11 @@ namespace OpenSim.Framework
 
         public static readonly int ALPHA = 13;
         public static readonly int TATTOO = 14;
-//        public static readonly int PHYSICS = 15;
 
-        //        public static readonly int MAX_WEARABLES = 16;
         public static readonly int MAX_WEARABLES = 15;
+//        public static readonly int PHYSICS = 15;
+//        public static readonly int MAX_WEARABLES = 16;
+
 
         public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
         public static readonly UUID DEFAULT_BODY_ASSET = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 2a8e67d..5beb37d 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -665,7 +665,12 @@ namespace OpenSim.Framework
             if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
             {
                 OSDArray wears = (OSDArray)(args["wearables"]);
-                for (int i = 0; i < wears.Count / 2; i++) 
+
+                int count = wears.Count;
+                if (count > AvatarWearable.MAX_WEARABLES)
+                    count = AvatarWearable.MAX_WEARABLES;
+
+                for (int i = 0; i < count / 2; i++) 
                 {
                     AvatarWearable awear = new AvatarWearable((OSDArray)wears[i]);
                     Appearance.SetWearable(i,awear);
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index cde2862..a890d3b 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -43,12 +43,14 @@ namespace OpenSim.Framework
 
         public static WearableCacheItem[] GetDefaultCacheItem()
         {
-            int itemmax = 21;
+            int itemmax = AvatarAppearance.TEXTURE_COUNT;
             WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
             for (uint i=0;i<itemmax;i++)
                 retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i};
-            return retitems;
+            return retitems;          
         }
+       
+
         public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache)
         {
             List<WearableCacheItem> ret = new List<WearableCacheItem>();
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 2e5c58a..797ec2b 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -417,9 +417,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                         {
                             wearableCache[idx].CacheId = cacheItems[i].CacheId;
                             validDirtyBakes++;
-                            hits++;
+                           
                             //assuming this can only happen if asset is in cache
                         }
+                        hits++;
                         continue;
                     }
                    
@@ -448,7 +449,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             // if we got a full set of baked textures save all in BakedTextureModule
 
-            if (validDirtyBakes == cacheItems.Length)
+            if (validDirtyBakes > 0 && hits == cacheItems.Length)
             {
                 IBakedTextureModule m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
                 if (m_BakedTextureModule != null)
@@ -493,7 +494,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             wearableCache = WearableCacheItem.GetDefaultCacheItem();
 
-             int hits = 0;
+            int hits = 0;
+            bool gotbacked = false;
+
             // Cache wearable data for teleport.
             // Only makes sense if there's a bake module and a cache module
             if (bakedModule != null && cache != null)
@@ -524,8 +527,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                             bakedModuleCache[i].TextureAsset.Temporary = true;
                             bakedModuleCache[i].TextureAsset.Local = true;
                             cache.Store(bakedModuleCache[i].TextureAsset);
+
                         }
                     }
+                    gotbacked = true;
                 }
             }
 
@@ -535,52 +540,74 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 int idx = AvatarAppearance.BAKE_INDICES[i];
                 Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
 
-                // No face, so lets check our cache
-                if (face == null || face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                // on tp viewer assumes servers did the cache work
+                // and tp propagation of baked textures is broken somewhere
+                // so make grid cache be mandatory
+                if (gotbacked)
                 {
-                    sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint)idx);
-                    if (wearableCache[idx].TextureID != UUID.Zero)
-                    {
-                        sp.Appearance.Texture.FaceTextures[idx].TextureID = wearableCache[idx].TextureID;
-                        face = sp.Appearance.Texture.FaceTextures[idx];
-                        // let run to end of loop to check cache
-                    }
-                    else
+//                    m_log.Debug("[ValidateBakedCache] bakedModule cache override");
+                    if(sp.Appearance.Texture.FaceTextures[idx] == null)
+                        sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint)idx);
+                    sp.Appearance.Texture.FaceTextures[idx].TextureID = wearableCache[idx].TextureID;
+                    face = sp.Appearance.Texture.FaceTextures[idx];
+
+                    // this should be removed
+                    if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                     {
-                        sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
-                        face = sp.Appearance.Texture.FaceTextures[idx];
-// lets try not invalidating the cache entry 
-//                        wearableCache[idx].CacheId = UUID.Zero;
-//                        wearableCache[idx].TextureAsset = null;
-                        continue;
+                        defonly = false; // found a non-default texture reference
                     }
-                }
 
-                if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
-                {
-                    defonly = false; // found a non-default texture reference
                     continue;
                 }
-
-                if(wearableCache[idx].TextureID != face.TextureID)
+                else
                 {
-                    wearableCache[idx].CacheId = UUID.Zero;
-                    wearableCache[idx].TextureID = UUID.Zero;
-                    wearableCache[idx].TextureAsset = null;
-                    continue;
-                }
+                    // No face, so lets check our cache
+                    if (face == null || face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                    {
+                        sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint)idx);
+                        if (wearableCache[idx].TextureID != UUID.Zero)
+                        {
+                            sp.Appearance.Texture.FaceTextures[idx].TextureID = wearableCache[idx].TextureID;
+                            face = sp.Appearance.Texture.FaceTextures[idx];
+                            // let run to end of loop to check cache
+                        }
+                        else
+                        {
+                            sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                            face = sp.Appearance.Texture.FaceTextures[idx];
+                            // lets try not invalidating the cache entry 
+                            //                        wearableCache[idx].CacheId = UUID.Zero;
+                            //                        wearableCache[idx].TextureAsset = null;
+                            continue;
+                        }
+                    }
 
-                wearableCache[idx].TextureAsset = null;
-                if (cache != null)
-                {
-                    wearableCache[idx].TextureAsset = m_scene.AssetService.Get(face.TextureID.ToString());
-                    if (wearableCache[idx].TextureAsset == null)
+                    if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                    {
+                        defonly = false; // found a non-default texture reference
+                        continue;
+                    }
+
+                    if (wearableCache[idx].TextureID != face.TextureID)
                     {
                         wearableCache[idx].CacheId = UUID.Zero;
                         wearableCache[idx].TextureID = UUID.Zero;
+                        wearableCache[idx].TextureAsset = null;
+                        continue;
+                    }
+
+                    wearableCache[idx].TextureAsset = null;
+                    if (cache != null)
+                    {
+                        wearableCache[idx].TextureAsset = m_scene.AssetService.Get(face.TextureID.ToString());
+                        if (wearableCache[idx].TextureAsset == null)
+                        {
+                            wearableCache[idx].CacheId = UUID.Zero;
+                            wearableCache[idx].TextureID = UUID.Zero;
+                        }
+                        else
+                            hits++;
                     }
-                    else
-                        hits++;
                 }
             }