aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2014-11-10 04:48:19 +0100
committerMelanie Thielker2014-11-10 04:48:19 +0100
commit36ecad98a1c04e09ceff17ce6850a45d38f9c95f (patch)
treecc6e67dd94864ace562d9c11ba36e9ef5751a88a /OpenSim
parentAdd a new baked texure module methid to support baked texturing mesh avatars (diff)
downloadopensim-SC_OLD-36ecad98a1c04e09ceff17ce6850a45d38f9c95f.zip
opensim-SC_OLD-36ecad98a1c04e09ceff17ce6850a45d38f9c95f.tar.gz
opensim-SC_OLD-36ecad98a1c04e09ceff17ce6850a45d38f9c95f.tar.bz2
opensim-SC_OLD-36ecad98a1c04e09ceff17ce6850a45d38f9c95f.tar.xz
Only send the actual bakes to the bakes module
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 1d2fd4e..1eb7d2d 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -462,14 +462,16 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
462 462
463 WearableCacheItem[] toBakedModule = new WearableCacheItem[AvatarAppearance.BAKE_INDICES.Length]; 463 WearableCacheItem[] toBakedModule = new WearableCacheItem[AvatarAppearance.BAKE_INDICES.Length];
464 464
465 for (int i = 0; i < cacheItems.Length; i++) 465 for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
466 { 466 {
467 int idx = (int)cacheItems[i].TextureIndex; 467 int idx = (int)AvatarAppearance.BAKE_INDICES[i];
468 cacheItems[i].CacheId = wearableCache[idx].CacheId; 468 toBakedModule[i] = new WearableCacheItem();
469 cacheItems[i].TextureID = wearableCache[idx].TextureID; 469 toBakedModule[i].TextureIndex = (uint)idx;
470 cacheItems[i].TextureAsset = wearableCache[idx].TextureAsset; 470 toBakedModule[i].CacheId = wearableCache[idx].CacheId;
471 toBakedModule[i].TextureID = wearableCache[idx].TextureID;
472 toBakedModule[i].TextureAsset = wearableCache[idx].TextureAsset;
471 } 473 }
472 m_BakedTextureModule.Store(sp.UUID, cacheItems); 474 m_BakedTextureModule.Store(sp.UUID, toBakedModule);
473 } 475 }
474 } 476 }
475 477