aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
diff options
context:
space:
mode:
authorOren Hurvitz2012-04-23 15:31:45 +0300
committerJustin Clark-Casey (justincc)2012-04-24 21:38:09 +0100
commit2f398231acda79e313c2975ecdd5a6015cb71a54 (patch)
treeb5277aca723d6ccf74ec875d4b6fd05e8c9453c1 /OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
parentRefactored how asset/inventory types are associated with content types: gathe... (diff)
downloadopensim-SC_OLD-2f398231acda79e313c2975ecdd5a6015cb71a54.zip
opensim-SC_OLD-2f398231acda79e313c2975ecdd5a6015cb71a54.tar.gz
opensim-SC_OLD-2f398231acda79e313c2975ecdd5a6015cb71a54.tar.bz2
opensim-SC_OLD-2f398231acda79e313c2975ecdd5a6015cb71a54.tar.xz
Minor improvements to logging
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index b0cee03..bf5609f 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -248,10 +248,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
248 248
249 if (bakedTextureFace == null) 249 if (bakedTextureFace == null)
250 { 250 {
251 m_log.WarnFormat( 251 // This can happen legitimately, since some baked textures might not exist
252 "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently", 252 //m_log.WarnFormat(
253 bakeType, sp.Name, m_scene.RegionInfo.RegionName); 253 // "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently",
254 254 // bakeType, sp.Name, m_scene.RegionInfo.RegionName);
255 continue; 255 continue;
256 } 256 }
257 257
@@ -417,7 +417,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
417// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]); 417// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
418 418
419 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType); 419 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
420 bakedTextures[bakeType] = faceTextures[ftIndex]; 420 Primitive.TextureEntryFace texture = faceTextures[ftIndex]; // this will be null if there's no such baked texture
421 bakedTextures[bakeType] = texture;
421 } 422 }
422 423
423 return bakedTextures; 424 return bakedTextures;