Remove the Invisible stuff and add more baked caching. Refactor selection of textures to save to Bakes module.

1 files changed, 3 insertions, 13 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 1eb7d2d..22f0366 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -460,18 +460,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 {
                     m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache");
 
-                    WearableCacheItem[] toBakedModule = new WearableCacheItem[AvatarAppearance.BAKE_INDICES.Length];
-
-                    for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
-                    {
-                        int idx = (int)AvatarAppearance.BAKE_INDICES[i];
-                        toBakedModule[i] = new WearableCacheItem();
-                        toBakedModule[i].TextureIndex = (uint)idx;
-                        toBakedModule[i].CacheId = wearableCache[idx].CacheId;
-                        toBakedModule[i].TextureID = wearableCache[idx].TextureID;
-                        toBakedModule[i].TextureAsset = wearableCache[idx].TextureAsset;
-                    }
-                    m_BakedTextureModule.Store(sp.UUID, toBakedModule);
+                    m_BakedTextureModule.Store(sp.UUID);
                 }
             }
 
@@ -610,8 +599,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     {
                         bakedModuleCache = bakedModule.Get(sp.UUID);
                     }
-                    catch (Exception)
+                    catch (Exception e)
                     {
+                        m_log.ErrorFormat(e.ToString());
                         bakedModuleCache = null;
                     }