bad merge?

2 files changed, 301 insertions, 99 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index cfb082b..1e9cfba 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -188,27 +188,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 // Process the visual params, this may change height as well
                 if (visualParams != null)
                 {
-                    //                    string[] visualParamsStrings = new string[visualParams.Length];
-                    //                    for (int i = 0; i < visualParams.Length; i++)
-                    //                        visualParamsStrings[i] = visualParams[i].ToString();
-                    //                    m_log.DebugFormat(
-                    //                        "[AVFACTORY]: Setting visual params for {0} to {1}",
-                    //                        client.Name, string.Join(", ", visualParamsStrings));
-/*
-                    float oldHeight = sp.Appearance.AvatarHeight;
-                    changed = sp.Appearance.SetVisualParams(visualParams);
-
-                    if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0)
-                        ((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight);
- */
-//                    float oldoff = sp.Appearance.AvatarFeetOffset;
-//                    Vector3 oldbox = sp.Appearance.AvatarBoxSize;
                     changed = sp.Appearance.SetVisualParams(visualParams);
-//                    float off = sp.Appearance.AvatarFeetOffset;
-//                    Vector3 box = sp.Appearance.AvatarBoxSize;
-//                    if(oldoff != off || oldbox != box)
-//                        ((ScenePresence)sp).SetSize(box,off);
-
                 }
             
                 // Process the baked texture array
@@ -222,9 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
 //                    WriteBakedTexturesReport(sp, m_log.DebugFormat);
 
-                    // If bake textures are missing and this is not an NPC, request a rebake from client
-                    if (!ValidateBakedTextureCache(sp) && (((ScenePresence)sp).PresenceType != PresenceType.Npc))
-                        RequestRebake(sp, true);
+                    UpdateBakedTextureCache(sp, cacheItems);
 
                     // This appears to be set only in the final stage of the appearance
                     // update transaction. In theory, we should be able to do an immediate
@@ -377,114 +355,335 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             }
         }
 
-        public bool ValidateBakedTextureCache(IScenePresence sp)
+        // called on textures update
+        public bool UpdateBakedTextureCache(IScenePresence sp, WearableCacheItem[] cacheItems)
         {
-            bool defonly = true; // are we only using default textures
-            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
-            IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            WearableCacheItem[] wearableCache = null;
-
-            // Cache wearable data for teleport.
-            // Only makes sense if there's a bake module and a cache module
-            if (bakedModule != null && cache != null)
+            // npcs dont have baked cache
+            if (((ScenePresence)sp).isNPC)
+                return true;
+
+            // uploaded baked textures will be in assets local cache
+            IAssetService cache = m_scene.AssetService;
+            IBakedTextureModule m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+
+            int validDirtyBakes = 0;
+            int hits = 0;
+
+            // our main cacheIDs mapper is p.Appearance.WearableCacheItems
+            WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems;
+
+            if (wearableCache == null)
             {
-                try
-                {
-                    wearableCache = bakedModule.Get(sp.UUID);
-                }
-                catch (Exception)
-                {
+                wearableCache = WearableCacheItem.GetDefaultCacheItem();
+            }
+
+            List<UUID> missing = new List<UUID>();
+
+            // Process received baked textures
+            for (int i = 0; i < cacheItems.Length; i++)
+            {
+                int idx = (int)cacheItems[i].TextureIndex;
+                Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
 
+                // No face
+                if (face == null)
+                {
+                    // for some reason viewer is cleaning this
+                    sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
+                    sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                    wearableCache[idx].CacheId = UUID.Zero;
+                    wearableCache[idx].TextureID = UUID.Zero;
+                    wearableCache[idx].TextureAsset = null;
+                    continue;
                 }
-                if (wearableCache != null)
+                else
                 {
-                    for (int i = 0; i < wearableCache.Length; i++)
+                    if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                     {
-                       cache.Cache(wearableCache[i].TextureAsset);
+                        wearableCache[idx].CacheId = UUID.Zero;
+                        wearableCache[idx].TextureID = UUID.Zero;
+                        wearableCache[idx].TextureAsset = null;
+                        continue;
                     }
-                }
-            }
-            /*
-             IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            if (invService.GetRootFolder(userID) != null)
-            {
-                WearableCacheItem[] wearableCache = null;
-                if (bakedModule != null)
-                {
-                    try
+
+/*
+                    if (face.TextureID == wearableCache[idx].TextureID && m_BakedTextureModule != null)
                     {
-                        wearableCache = bakedModule.Get(userID);
-                        appearance.WearableCacheItems = wearableCache;
-                        appearance.WearableCacheItemsDirty = false;
-                        foreach (WearableCacheItem item in wearableCache)
+                        if (wearableCache[idx].CacheId != cacheItems[i].CacheId)
                         {
-                            appearance.Texture.FaceTextures[item.TextureIndex].TextureID = item.TextureID;
+                            wearableCache[idx].CacheId = cacheItems[i].CacheId;
+                            validDirtyBakes++;
+
+                            //assuming this can only happen if asset is in cache
                         }
+                        hits++;
+                        continue;
+                    }
+*/
+                    wearableCache[idx].TextureAsset = null;
+                    if (cache != null)
+                       wearableCache[idx].TextureAsset = cache.GetCached(face.TextureID.ToString());
+
+                    if (wearableCache[idx].TextureAsset != null)
+                    {
+                        if ( wearableCache[idx].TextureID != face.TextureID ||
+                                wearableCache[idx].CacheId != cacheItems[i].CacheId)
+                            validDirtyBakes++;
+
+                        wearableCache[idx].TextureID = face.TextureID;
+                        wearableCache[idx].CacheId = cacheItems[i].CacheId;
+                        hits++;
                     }
-                    catch (Exception)
+                    else
                     {
-                        
+                        wearableCache[idx].CacheId = UUID.Zero;
+                        wearableCache[idx].TextureID = UUID.Zero;
+                        wearableCache[idx].TextureAsset = null;
+                        missing.Add(face.TextureID);
+                        continue;
                     }
                 }
-             */
+            }
 
-            // Process the texture entry
-            for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
+            sp.Appearance.WearableCacheItems = wearableCache;
+           
+            if (missing.Count > 0)
             {
-                int idx = AvatarAppearance.BAKE_INDICES[i];
-                Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+                foreach (UUID id in missing)
+                    sp.ControllingClient.SendRebakeAvatarTextures(id);
+            }
 
-                // No face, so lets check our baked service cache, teleport or login.
-                if (face == null)
+            if (validDirtyBakes > 0 && hits == cacheItems.Length)
+            {
+                // if we got a full set of baked textures save all in BakedTextureModule
+                if (m_BakedTextureModule != null)
                 {
-                    if (wearableCache != null)
+                    m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache");
+
+                    m_BakedTextureModule.Store(sp.UUID);
+                }
+            }
+
+
+            // debug
+            m_log.Debug("[UpdateBakedCache] cache hits: " + hits.ToString() + " changed entries: " + validDirtyBakes.ToString() + " rebakes " + missing.Count);
+/*
+            for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+            {
+                int j = AvatarAppearance.BAKE_INDICES[iter];
+                m_log.Debug("[UpdateBCache] {" + iter + "/" + 
+                                    sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
+                                    sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
+                                    sp.Appearance.WearableCacheItems[j].TextureID);
+            }
+*/
+            return (hits == cacheItems.Length);
+        }
+
+        // called when we get a new root avatar
+        public bool ValidateBakedTextureCache(IScenePresence sp)
+        {
+            int hits = 0;
+
+            if (((ScenePresence)sp).isNPC)
+                return true;
+
+            lock (m_setAppearanceLock)
+            {
+                IAssetService cache = m_scene.AssetService;
+                IBakedTextureModule bakedModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+                WearableCacheItem[] bakedModuleCache = null;
+
+                if (cache == null)
+                    return false;
+
+                WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems;
+
+                // big debug
+                m_log.DebugFormat("[AVFACTORY]: ValidateBakedTextureCache start for {0} {1}", sp.Name, sp.UUID);
+/*
+                for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+                {
+                    int j = AvatarAppearance.BAKE_INDICES[iter];
+                    Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[j];
+                    if (wearableCache == null)
                     {
-                        // If we find the an appearance item, set it as the textureentry and the face
-                        WearableCacheItem searchitem = WearableCacheItem.SearchTextureIndex((uint) idx, wearableCache);
-                        if (searchitem != null)
-                        {
-                            sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint) idx);
-                            sp.Appearance.Texture.FaceTextures[idx].TextureID = searchitem.TextureID;
-                            face = sp.Appearance.Texture.FaceTextures[idx];
-                        }
+                        if (face != null)
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t- " + face.TextureID);
                         else
-                        {
-                            // if there is no texture entry and no baked cache, skip it
-                            continue;
-                        }
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t- No texture");
                     }
                     else
                     {
-                        //No texture entry face and no cache.  Skip this face.
-                        continue;
+                        if (face != null)
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " ft- " + face.TextureID +
+                                   "}: cc-" +
+                                    wearableCache[j].CacheId + ", ct-" +
+                                    wearableCache[j].TextureID
+                                );
+                        else
+                            m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t - No texture" +
+                                    "}: cc-" +
+                                    wearableCache[j].CacheId + ", ct-" +
+                                    wearableCache[j].TextureID
+                                );
                     }
                 }
+<<<<<<< HEAD
                     
 //                m_log.DebugFormat(
 //                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
 //                    face.TextureID, idx, client.Name, client.AgentId);
+=======
+*/
+                bool wearableCacheValid = false;
+                if (wearableCache == null)
+                {
+                    wearableCache = WearableCacheItem.GetDefaultCacheItem();
+                }
+                else
+                {
+                    // we may have received a full cache
+                    // check same coerence and store
+                    wearableCacheValid = true;
+                    for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
+                    {
+                        int idx = AvatarAppearance.BAKE_INDICES[i];
+                        Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+                        if (face != null)
+                        {
+                            if (face.TextureID == wearableCache[idx].TextureID &&
+                                face.TextureID != UUID.Zero)
+                            {
+                                if (wearableCache[idx].TextureAsset != null)
+                                {
+                                    hits++;
+                                    wearableCache[idx].TextureAsset.Temporary = true;
+                                    wearableCache[idx].TextureAsset.Local = true;
+                                    cache.Store(wearableCache[idx].TextureAsset);
+                                    continue;
+                                }
+                                if (cache.GetCached((wearableCache[idx].TextureID).ToString()) != null)
+                                {
+                                    hits++;
+                                    continue;
+                                }
+                            }
+                            wearableCacheValid = false;
+                        }
+                    }
+                   
+                    wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1));
+                    if (wearableCacheValid)
+                        m_log.Debug("[ValidateBakedCache] have valid local cache");
+                }
+>>>>>>> avn/ubitvar
 
-                // if the texture is one of the "defaults" then skip it
-                // this should probably be more intelligent (skirt texture doesnt matter
-                // if the avatar isnt wearing a skirt) but if any of the main baked 
-                // textures is default then the rest should be as well
-                if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
-                    continue;
-                
-                defonly = false; // found a non-default texture reference
+                bool checkExternal = false;
 
+<<<<<<< HEAD
                 if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
                     return false;
             }
+=======
+                if (!wearableCacheValid)
+                {
+                    // only use external bake module on login condition check                  
+//                    ScenePresence ssp = null;
+//                    if (sp is ScenePresence)
+                    {
+//                        ssp = (ScenePresence)sp;
+//                        checkExternal = (((uint)ssp.TeleportFlags & (uint)TeleportFlags.ViaLogin) != 0) &&
+//                            bakedModule != null;
+
+                        // or do it anytime we dont have the cache
+                        checkExternal = bakedModule != null;
+                    }
+                }
 
-//            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
+                if (checkExternal)
+                {
+                    hits = 0;
+                    bool gotbacked = false;
 
-            // If we only found default textures, then the appearance is not cached
-            return (defonly ? false : true);
+                    m_log.Debug("[ValidateBakedCache] local cache invalid, checking bakedModule");
+                    try
+                    {
+                        bakedModuleCache = bakedModule.Get(sp.UUID);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(e.ToString());
+                        bakedModuleCache = null;
+                    }
+
+                    if (bakedModuleCache != null)
+                    {
+                        m_log.Debug("[ValidateBakedCache] got bakedModule " + bakedModuleCache.Length + " cached textures");
+
+                        for (int i = 0; i < bakedModuleCache.Length; i++)
+                        {
+                            int j = (int)bakedModuleCache[i].TextureIndex;
+
+                            if (bakedModuleCache[i].TextureAsset != null)
+                            {
+                                wearableCache[j].TextureID = bakedModuleCache[i].TextureID;
+                                wearableCache[j].CacheId = bakedModuleCache[i].CacheId;
+                                wearableCache[j].TextureAsset = bakedModuleCache[i].TextureAsset;
+                                bakedModuleCache[i].TextureAsset.Temporary = true;
+                                bakedModuleCache[i].TextureAsset.Local = true;
+                                cache.Store(bakedModuleCache[i].TextureAsset);
+                            }
+                        }
+                        gotbacked = true;
+                    }
+
+                    if (gotbacked)
+                    {
+                        // force the ones we got
+                        for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
+                        {
+                            int idx = AvatarAppearance.BAKE_INDICES[i];
+                            Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
+
+                            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)
+                                hits++;
+                            continue;
+                        }
+                    }
+                }
+>>>>>>> avn/ubitvar
+
+                sp.Appearance.WearableCacheItems = wearableCache;
+
+            }
+
+            // debug
+            m_log.DebugFormat("[ValidateBakedCache]: Completed texture check for {0} {1} with {2} hits", sp.Name, sp.UUID, hits);
+/*
+            for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
+            {
+                int j = AvatarAppearance.BAKE_INDICES[iter];
+                m_log.Debug("[ValidateBakedCache] {" + iter + "/" +
+                                    sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" +
+                                    sp.Appearance.WearableCacheItems[j].CacheId + ", t-" +
+                                    sp.Appearance.WearableCacheItems[j].TextureID);
+            }
+*/
+            return (hits >= AvatarAppearance.BAKE_INDICES.Length - 1); // skirt is optional
         }
 
         public int RequestRebake(IScenePresence sp, bool missingTexturesOnly)
         {
+            if (((ScenePresence)sp).isNPC)
+                return 0;
+
             int texturesRebaked = 0;
 //            IImprovedAssetCache cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
 
@@ -497,14 +696,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 if (face == null)
                     continue;
 
-//                m_log.DebugFormat(
-//                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
-//                    face.TextureID, idx, client.Name, client.AgentId);
-
-                // if the texture is one of the "defaults" then skip it
-                // this should probably be more intelligent (skirt texture doesnt matter
-                // if the avatar isnt wearing a skirt) but if any of the main baked
-                // textures is default then the rest should be as well
                 if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                     continue;
 
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 9513408..b7ff4e0 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -132,6 +132,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             for (byte i = 0; i < visualParams.Length; i++)
                 visualParams[i] = i;
 
+<<<<<<< HEAD
             Primitive.TextureEntry bakedTextureEntry = new Primitive.TextureEntry(TestHelpers.ParseTail(0x10));
             uint eyesFaceIndex = (uint)AppearanceManager.BakeTypeToAgentTextureIndex(BakeType.Eyes);
             Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
@@ -144,6 +145,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
     
             Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
+=======
+            afm.SetAppearance(sp, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams, new WearableCacheItem[0]);
+
+            // TODO: Check baked texture
+            Assert.AreEqual(visualParams, sp.Appearance.VisualParams);
+>>>>>>> avn/ubitvar
         }
 
         [Test]
@@ -181,7 +188,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
             eyesFace.TextureID = eyesTextureId;
 
+<<<<<<< HEAD
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
+=======
+            afm.SetAppearance(sp, bakedTextureEntry, visualParams, new WearableCacheItem[0]);
+>>>>>>> avn/ubitvar
             afm.SaveBakedTextures(userId);
 //            Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId);