aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-09 23:54:39 +0000
committerJustin Clark-Casey (justincc)2011-12-09 23:54:39 +0000
commit5f276c3212cd0e5385e62d0607c5adeec29b76d7 (patch)
treef05ac330f73f987add0d381a842ad021cd6a6c1a
parentminor: comment out "unpacked appearance" log mesasge for now (diff)
downloadopensim-SC_OLD-5f276c3212cd0e5385e62d0607c5adeec29b76d7.zip
opensim-SC_OLD-5f276c3212cd0e5385e62d0607c5adeec29b76d7.tar.gz
opensim-SC_OLD-5f276c3212cd0e5385e62d0607c5adeec29b76d7.tar.bz2
opensim-SC_OLD-5f276c3212cd0e5385e62d0607c5adeec29b76d7.tar.xz
Print out one log message for every missing baked texture, rather than two.
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs26
1 files changed, 4 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 07d1cb3..f06fb14 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -320,14 +320,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
320 320
321 defonly = false; // found a non-default texture reference 321 defonly = false; // found a non-default texture reference
322 322
323 if (!CheckBakedTextureAsset(sp, face.TextureID, idx)) 323 if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
324 { 324 {
325 // the asset didn't exist if we are only checking, then we found a bad
326 // one and we're done otherwise, ask for a rebake
327 if (checkonly) 325 if (checkonly)
328 return false; 326 return false;
329 327
330 m_log.InfoFormat("[AVFACTORY]: missing baked texture {0}, requesting rebake", face.TextureID); 328 m_log.DebugFormat(
329 "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
330 face.TextureID, idx, sp.Name);
331 331
332 sp.ControllingClient.SendRebakeAvatarTextures(face.TextureID); 332 sp.ControllingClient.SendRebakeAvatarTextures(face.TextureID);
333 } 333 }
@@ -339,24 +339,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
339 return (defonly ? false : true); 339 return (defonly ? false : true);
340 } 340 }
341 341
342 /// <summary>
343 /// Checks for the existance of a baked texture asset and
344 /// requests the viewer rebake if the asset is not found
345 /// </summary>
346 /// <param name="sp"></param>
347 /// <param name="textureID"></param>
348 /// <param name="idx"></param>
349 private bool CheckBakedTextureAsset(IScenePresence sp, UUID textureID, int idx)
350 {
351 if (m_scene.AssetService.Get(textureID.ToString()) == null)
352 {
353 m_log.WarnFormat("[AVFACTORY]: Missing baked texture {0} ({1}) for avatar {2}",
354 textureID, idx, sp.Name);
355 return false;
356 }
357 return true;
358 }
359
360 private Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(ScenePresence sp) 342 private Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(ScenePresence sp)
361 { 343 {
362 if (sp.IsChildAgent) 344 if (sp.IsChildAgent)