From b78354ac79385bcb28316aa3f43913393ad8c5ab Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 20 Dec 2017 21:56:46 +0000 Subject: SL-731 - show est tris in metadata->triangle count display --- indra/newview/llvovolume.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'indra') diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index e291416f92..ad72fa9480 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1308,16 +1308,12 @@ BOOL LLVOVolume::calcLOD() if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TRIANGLE_COUNT) && mDrawable->getFace(0)) { - if (isRootEdit() && getChildren().size()>0) + if (isRootEdit()) { S32 total_tris = recursiveGetTriangleCount(); - setDebugText(llformat("TRIS %d TOTAL %d", getTriangleCount(), total_tris)); + S32 est_max_tris = recursiveGetEstTrianglesMax(); + setDebugText(llformat("TRIS SHOWN %d EST %d", total_tris, est_max_tris)); } - else - { - setDebugText(llformat("TRIS %d", getTriangleCount())); - } - } if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_LOD_INFO) && mDrawable->getFace(0)) -- cgit v1.2.3