diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 14607e9..8fcb511 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -494,16 +494,17 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
494 | else | 494 | else |
495 | m_log.DebugFormat("[UpdateBakedCache] cache hits: {0} changed entries: {1} rebakes {2}", | 495 | m_log.DebugFormat("[UpdateBakedCache] cache hits: {0} changed entries: {1} rebakes {2}", |
496 | hits.ToString(), validDirtyBakes.ToString(), missing.Count); | 496 | hits.ToString(), validDirtyBakes.ToString(), missing.Count); |
497 | /* | 497 | |
498 | for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) | 498 | for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) |
499 | { | 499 | { |
500 | int j = AvatarAppearance.BAKE_INDICES[iter]; | 500 | int j = AvatarAppearance.BAKE_INDICES[iter]; |
501 | m_log.Debug("[UpdateBCache] {" + iter + "/" + | 501 | sp.Appearance.WearableCacheItems[j].TextureAsset = null; |
502 | sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" + | 502 | // m_log.Debug("[UpdateBCache] {" + iter + "/" + |
503 | sp.Appearance.WearableCacheItems[j].CacheId + ", t-" + | 503 | // sp.Appearance.WearableCacheItems[j].TextureIndex + "}: c-" + |
504 | sp.Appearance.WearableCacheItems[j].TextureID); | 504 | // sp.Appearance.WearableCacheItems[j].CacheId + ", t-" + |
505 | // sp.Appearance.WearableCacheItems[j].TextureID); | ||
505 | } | 506 | } |
506 | */ | 507 | |
507 | return (hits == cacheItems.Length); | 508 | return (hits == cacheItems.Length); |
508 | } | 509 | } |
509 | 510 | ||
@@ -583,6 +584,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
583 | wearableCache[idx].TextureAsset.Temporary = true; | 584 | wearableCache[idx].TextureAsset.Temporary = true; |
584 | wearableCache[idx].TextureAsset.Local = true; | 585 | wearableCache[idx].TextureAsset.Local = true; |
585 | cache.Cache(wearableCache[idx].TextureAsset); | 586 | cache.Cache(wearableCache[idx].TextureAsset); |
587 | wearableCache[idx].TextureAsset = null; | ||
586 | continue; | 588 | continue; |
587 | } | 589 | } |
588 | 590 | ||
@@ -683,6 +685,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
683 | 685 | ||
684 | face.TextureID = wearableCache[idx].TextureID; | 686 | face.TextureID = wearableCache[idx].TextureID; |
685 | hits++; | 687 | hits++; |
688 | wearableCache[idx].TextureAsset = null; | ||
686 | } | 689 | } |
687 | } | 690 | } |
688 | } | 691 | } |