diff options
| author | Richard Linden <none@none> | 2013-04-11 19:18:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-11 19:18:55 -0700 |
| commit | 1459a412b9c9776daa7e6f3b5be35fe67970b3c5 (patch) | |
| tree | 7f25dd68f3d8408f6f1b37b2f9ad9d0613679daf /indra/newview/llviewertexturelist.cpp | |
| parent | c05fa390dc57b072da4b69b4e08743fd62bf4ce5 (diff) | |
| parent | 2436bd9487ac62899ed01859bdd4c0871020d4f7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 0a81c9deb0..759b0c580f 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -617,9 +617,7 @@ void LLViewerTextureList::updateImages(F32 max_time) } cleared = FALSE; - LLTrace::Recording& recording = LLTrace::get_frame_recording().getTotalRecording(); - - LLAppViewer::getTextureFetch()->setTextureBandwidth(recording.getPerSec(LLStatViewer::TEXTURE_KBIT).value()); + LLAppViewer::getTextureFetch()->setTextureBandwidth(LLTrace::get_frame_recording().getPeriodMeanPerSec(LLStatViewer::TEXTURE_KBIT)); { using namespace LLStatViewer; @@ -742,7 +740,7 @@ void LLViewerTextureList::updateImagesDecodePriorities() // // Flush formatted images using a lazy flush - // + // S32 num_refs = imagep->getNumRefs(); if (num_refs == min_refs) { |