aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2014-10-26 18:53:11 +0000
committerUbitUmarov2014-10-26 18:53:11 +0000
commitc46c3a27aeee2bd26ed0cfbcdc9d73a29603f479 (patch)
treee5609f15aeba2b0547edb3bd2974e65256eb3ed6
parent missing file (diff)
downloadopensim-SC_OLD-c46c3a27aeee2bd26ed0cfbcdc9d73a29603f479.zip
opensim-SC_OLD-c46c3a27aeee2bd26ed0cfbcdc9d73a29603f479.tar.gz
opensim-SC_OLD-c46c3a27aeee2bd26ed0cfbcdc9d73a29603f479.tar.bz2
opensim-SC_OLD-c46c3a27aeee2bd26ed0cfbcdc9d73a29603f479.tar.xz
do consider skirt baked texture on validation
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 297044f..f8bb435 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -543,6 +543,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
543 { 543 {
544 // we may have received a full cache 544 // we may have received a full cache
545 // check same coerence and store 545 // check same coerence and store
546 wearableCacheValid = true;
546 for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++) 547 for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
547 { 548 {
548 int idx = AvatarAppearance.BAKE_INDICES[i]; 549 int idx = AvatarAppearance.BAKE_INDICES[i];
@@ -555,16 +556,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
555 wearableCache[idx].TextureAsset.Temporary = true; 556 wearableCache[idx].TextureAsset.Temporary = true;
556 wearableCache[idx].TextureAsset.Local = true; 557 wearableCache[idx].TextureAsset.Local = true;
557 cache.Store(wearableCache[idx].TextureAsset); 558 cache.Store(wearableCache[idx].TextureAsset);
558 559
559 } 560 }
560 else if (cache.GetCached((wearableCache[idx].TextureID).ToString()) != null) 561 else if (cache.GetCached((wearableCache[idx].TextureID).ToString()) != null)
561 { 562 {
562 hits++; 563 hits++;
563 } 564 }
565 else
566 {
567 wearableCacheValid = false;
568 break;
569 }
564 } 570 }
565 } 571 }
566 572
567 wearableCacheValid = (hits >= AvatarAppearance.BAKE_INDICES.Length - 1); // skirt is optional 573 wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1));
568 if (wearableCacheValid) 574 if (wearableCacheValid)
569 m_log.Debug("[ValidateBakedCache] have valid local cache"); 575 m_log.Debug("[ValidateBakedCache] have valid local cache");
570 } 576 }