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

This commit is contained in:
Melanie Thielker
2014-11-11 07:09:30 +01:00
parent 9516ebac24
commit bec456c2a5
5 changed files with 7 additions and 54 deletions

View File

@@ -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;
}