aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2012-01-10 11:11:08 -0800
committerDiva Canto2012-01-10 11:11:08 -0800
commitce44f56af97cb84ae8cc6e33c0330c44dd8bed96 (patch)
treeda1bc3a8f858a8566ac7d4c70c152a5e2b7b52b3 /OpenSim/Region/CoreModules
parentHG landing points: this hopefully fixes some confusion that was making HG avi... (diff)
parentAdd avatar names to appearance log messages (diff)
downloadopensim-SC-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.zip
opensim-SC-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.tar.gz
opensim-SC-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.tar.bz2
opensim-SC-ce44f56af97cb84ae8cc6e33c0330c44dd8bed96.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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