aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2018-03-10 22:09:56 +0000
committerUbitUmarov2018-03-10 22:09:56 +0000
commit1363a95840bae4881e6f942357bcc4289cd729dc (patch)
tree1f1546da8bc62212412f6ba026739c4b4c2e9b4a /OpenSim/Region/CoreModules
parentMerge branch 'master' into httptests (diff)
parentcomment out some debug messages visible on SOP CompleteMovement (diff)
downloadopensim-SC-1363a95840bae4881e6f942357bcc4289cd729dc.zip
opensim-SC-1363a95840bae4881e6f942357bcc4289cd729dc.tar.gz
opensim-SC-1363a95840bae4881e6f942357bcc4289cd729dc.tar.bz2
opensim-SC-1363a95840bae4881e6f942357bcc4289cd729dc.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 9553f5b..4abac43 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -528,7 +528,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
528 WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems; 528 WearableCacheItem[] wearableCache = sp.Appearance.WearableCacheItems;
529 529
530 // big debug 530 // big debug
531 m_log.DebugFormat("[AVFACTORY]: ValidateBakedTextureCache start for {0} {1}", sp.Name, sp.UUID); 531 //m_log.DebugFormat("[AVFACTORY]: ValidateBakedTextureCache start for {0} {1}", sp.Name, sp.UUID);
532/* 532/*
533 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) 533 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
534 { 534 {
@@ -600,7 +600,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
600 600
601 wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1)); 601 wearableCacheValid = (wearableCacheValid && (hits >= AvatarAppearance.BAKE_INDICES.Length - 1));
602 if (wearableCacheValid) 602 if (wearableCacheValid)
603 m_log.Debug("[ValidateBakedCache] have valid local cache"); 603 {
604 //m_log.Debug("[ValidateBakedCache] have valid local cache");
605 }
604 else 606 else
605 wearableCache[19].TextureAsset = null; // clear optional skirt 607 wearableCache[19].TextureAsset = null; // clear optional skirt
606 } 608 }
@@ -640,7 +642,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
640 642
641 if (bakedModuleCache != null) 643 if (bakedModuleCache != null)
642 { 644 {
643 m_log.Debug("[ValidateBakedCache] got bakedModule " + bakedModuleCache.Length + " cached textures"); 645 //m_log.Debug("[ValidateBakedCache] got bakedModule " + bakedModuleCache.Length + " cached textures");
644 646
645 for (int i = 0; i < bakedModuleCache.Length; i++) 647 for (int i = 0; i < bakedModuleCache.Length; i++)
646 { 648 {
@@ -695,7 +697,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
695 } 697 }
696 698
697 // debug 699 // debug
698 m_log.DebugFormat("[ValidateBakedCache]: Completed texture check for {0} {1} with {2} hits", sp.Name, sp.UUID, hits); 700 //m_log.DebugFormat("[ValidateBakedCache]: Completed texture check for {0} {1} with {2} hits", sp.Name, sp.UUID, hits);
699/* 701/*
700 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) 702 for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++)
701 { 703 {