diff options
author | Melanie Thielker | 2014-11-11 07:09:30 +0100 |
---|---|---|
committer | Melanie Thielker | 2014-11-11 07:09:30 +0100 |
commit | bec456c2a529ca0b9ca7fd59e8110e5d5b27c126 (patch) | |
tree | fdeb239af06878f6cfb39a137e61adfe04f0baa5 /OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |
parent | Merge branch 'avination-current' (diff) | |
download | opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.zip opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.gz opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.bz2 opensim-SC_OLD-bec456c2a529ca0b9ca7fd59e8110e5d5b27c126.tar.xz |
Remove the Invisible stuff and add more baked caching. Refactor selection of textures to save to Bakes module.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 16 |
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 | |||
460 | { | 460 | { |
461 | m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache"); | 461 | m_log.Debug("[UpdateBakedCache] uploading to bakedModule cache"); |
462 | 462 | ||
463 | WearableCacheItem[] toBakedModule = new WearableCacheItem[AvatarAppearance.BAKE_INDICES.Length]; | 463 | m_BakedTextureModule.Store(sp.UUID); |
464 | |||
465 | for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++) | ||
466 | { | ||
467 | int idx = (int)AvatarAppearance.BAKE_INDICES[i]; | ||
468 | toBakedModule[i] = new WearableCacheItem(); | ||
469 | toBakedModule[i].TextureIndex = (uint)idx; | ||
470 | toBakedModule[i].CacheId = wearableCache[idx].CacheId; | ||
471 | toBakedModule[i].TextureID = wearableCache[idx].TextureID; | ||
472 | toBakedModule[i].TextureAsset = wearableCache[idx].TextureAsset; | ||
473 | } | ||
474 | m_BakedTextureModule.Store(sp.UUID, toBakedModule); | ||
475 | } | 464 | } |
476 | } | 465 | } |
477 | 466 | ||
@@ -610,8 +599,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
610 | { | 599 | { |
611 | bakedModuleCache = bakedModule.Get(sp.UUID); | 600 | bakedModuleCache = bakedModule.Get(sp.UUID); |
612 | } | 601 | } |
613 | catch (Exception) | 602 | catch (Exception e) |
614 | { | 603 | { |
604 | m_log.ErrorFormat(e.ToString()); | ||
615 | bakedModuleCache = null; | 605 | bakedModuleCache = null; |
616 | } | 606 | } |
617 | 607 | ||