From 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 Mon Sep 17 00:00:00 2001 From: Eric Tulla Date: Thu, 5 Mar 2009 00:29:27 +0000 Subject: Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 . --- indra/newview/llviewerjointmesh.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewerjointmesh.cpp') diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index 4cacc5c97b..c0e02921cf 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -558,7 +558,12 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass) } else { - llwarns << "Layerset without composite" << llendl; + // This warning will always trigger if you've hacked the avatar to show as incomplete. + // Ignore the warning if that's the case. + if (!gSavedSettings.getBOOL("RenderUnloadedAvatar")) + { + llwarns << "Layerset without composite" << llendl; + } gGL.getTexUnit(0)->bind(gImageList.getImage(IMG_DEFAULT)); } } -- cgit v1.2.3