diff options
| author | Richard Linden <none@none> | 2012-10-10 20:15:21 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-10-10 20:15:21 -0700 |
| commit | b3107e37643743118840d3f5437e62196bae3581 (patch) | |
| tree | af6cbc569e7912303da6dbc3146fe9a1a229f992 /indra/newview/pipeline.cpp | |
| parent | 05510799e5a69eafcc919e72d25cf5b89c9274cf (diff) | |
| parent | 74ac0182ec8f7a0f6d0ea89f5814f0998ab90b62 (diff) | |
merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 86791a37fb..4582de805f 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -488,7 +488,7 @@ void LLPipeline::init() getPool(LLDrawPool::POOL_BUMP); getPool(LLDrawPool::POOL_GLOW); - LLViewerStats::getInstance()->mTrianglesDrawnStat.reset(); + //LLViewerStats::getInstance()->mTrianglesDrawnStat.reset(); resetFrameStats(); for (U32 i = 0; i < NUM_RENDER_TYPES; ++i) @@ -1768,7 +1768,8 @@ void LLPipeline::resetFrameStats() { assertInitialized(); - LLViewerStats::getInstance()->mTrianglesDrawnStat.addValue(mTrianglesDrawn/1000.f); + LLStatViewer::TRIANGLES_DRAWN.add(mTrianglesDrawn); + //LLViewerStats::getInstance()->mTrianglesDrawnStat.addValue(mTrianglesDrawn/1000.f); if (mBatchCount > 0) { |