aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index be85947..dc16593 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -466,7 +466,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
466 } 466 }
467 467
468 // debug 468 // debug
469 m_log.Debug("[UpdateBCache] hits: " +hits.ToString()); 469 m_log.Debug("[UpdateBakedCache] cache hits: " + hits.ToString() + " changed entries: " + validDirtyBakes.ToString());
470/* 470/*
471 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) 471 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
472 { 472 {
@@ -558,12 +558,16 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
558 558
559 if (!wearableCacheValid) 559 if (!wearableCacheValid)
560 { 560 {
561 ScenePresence ssp = null; 561 // only use external bake module on login condition check
562 if (sp is ScenePresence) 562// ScenePresence ssp = null;
563// if (sp is ScenePresence)
563 { 564 {
564 ssp = (ScenePresence)sp; 565// ssp = (ScenePresence)sp;
565 checkExternal = (((uint)ssp.TeleportFlags & (uint)TeleportFlags.ViaLogin) != 0) && 566// checkExternal = (((uint)ssp.TeleportFlags & (uint)TeleportFlags.ViaLogin) != 0) &&
566 bakedModule != null; 567// bakedModule != null;
568
569 // or do it anytime we dont have the cache
570 checkExternal = bakedModule != null;
567 } 571 }
568 } 572 }
569 573
@@ -572,7 +576,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
572 hits = 0; 576 hits = 0;
573 bool gotbacked = false; 577 bool gotbacked = false;
574 578
575 m_log.Debug("[ValidateBakedCache] local cache invalid, calling bakedModule"); 579 m_log.Debug("[ValidateBakedCache] local cache invalid, checking bakedModule");
576 try 580 try
577 { 581 {
578 bakedModuleCache = bakedModule.Get(sp.UUID); 582 bakedModuleCache = bakedModule.Get(sp.UUID);
@@ -584,7 +588,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
584 588
585 if (bakedModuleCache != null) 589 if (bakedModuleCache != null)
586 { 590 {
587 m_log.Debug("[ValidateBakedCache] got bakedModule cache " + bakedModuleCache.Length); 591 m_log.Debug("[ValidateBakedCache] got bakedModule " + bakedModuleCache.Length + " cached textures");
588 592
589 for (int i = 0; i < bakedModuleCache.Length; i++) 593 for (int i = 0; i < bakedModuleCache.Length; i++)
590 { 594 {
@@ -630,7 +634,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
630 } 634 }
631 635
632 // debug 636 // debug
633 m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1} {2}", sp.Name, sp.UUID, hits); 637 m_log.DebugFormat("[ValidateBakedCache]: Completed texture check for {0} {1} with {2} hits", sp.Name, sp.UUID, hits);
634/* 638/*
635 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) 639 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
636 { 640 {