aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorMelanie2012-01-10 20:34:43 +0000
committerMelanie2012-01-10 20:34:43 +0000
commita4c2e7f5997c74ae0006ff573f7576bfc6c1aa82 (patch)
treead7e9b44924581a13f04b6292e2be52e00bd7673 /OpenSim/Region/CoreModules/Avatar
parentMerge branch 'master' into careminster (diff)
parentRemove DEBUG option (diff)
downloadopensim-SC-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.zip
opensim-SC-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.tar.gz
opensim-SC-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.tar.bz2
opensim-SC-a4c2e7f5997c74ae0006ff573f7576bfc6c1aa82.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index d68d28c..8d503bd 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
149 // Process the baked texture array 149 // Process the baked texture array
150 if (textureEntry != null) 150 if (textureEntry != null)
151 { 151 {
152 m_log.InfoFormat("[AVFACTORY]: received texture update for {0}", sp.UUID); 152 m_log.InfoFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
153 153
154// WriteBakedTexturesReport(sp, m_log.DebugFormat); 154// WriteBakedTexturesReport(sp, m_log.DebugFormat);
155 155
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
315 return false; 315 return false;
316 } 316 }
317 317
318 m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0}", sp.UUID); 318 m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
319 319
320 // If we only found default textures, then the appearance is not cached 320 // If we only found default textures, then the appearance is not cached
321 return (defonly ? false : true); 321 return (defonly ? false : true);
@@ -626,4 +626,4 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
626 outputAction("{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt"); 626 outputAction("{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "corrupt");
627 } 627 }
628 } 628 }
629} 629} \ No newline at end of file