diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-06-17 13:18:50 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-06-17 13:18:50 -0400 |
| commit | d16e1b1b555e5b39456ec6b014f81ad663adc8d7 (patch) | |
| tree | 2e2abb3ba743bc82a8c0c01274d84b7e6e5e3504 /indra/newview/lltextureview.cpp | |
| parent | 903729d5c97c9f93daf463e155055653b92f8fe4 (diff) | |
Post-merge cleanup. In onCompleted() restore the unconditional
use of setGetStatus() in case the baked texture service changes
introduced some sort of hidden (and wrong) dependency. Left
out the ridiculous duplicated invocation inside that failure status
block. Someone damaged texture console again and apparently didn't
even bother to look at their work. I'm sure they documented
their changes on the public wiki as well. Unified the logging
tag throughout lltexturefetch.cpp. Only way to get the cut-n-
pasters to do the right thing.
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rwxr-xr-x | indra/newview/lltextureview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index aa1f680a1e..4f0413a2e4 100755 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -563,7 +563,7 @@ void LLGLTexMemBar::draw() //---------------------------------------------------------------------------- - text = llformat("Textures: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d RAW:%d HTP:%d DEC:%d CRE:%d", + text = llformat("Textures: %d Fetch: %d(%d) Pkts:%d(%d) Cache R/W: %d/%d LFS:%d RAW:%d HTP:%d DEC:%d CRE:%d ", gTextureList.getNumImages(), LLAppViewer::getTextureFetch()->getNumRequests(), LLAppViewer::getTextureFetch()->getNumDeletes(), LLAppViewer::getTextureFetch()->mPacketCount, LLAppViewer::getTextureFetch()->mBadPacketCount, @@ -585,7 +585,7 @@ void LLGLTexMemBar::draw() color = bandwidth > max_bandwidth ? LLColor4::red : bandwidth > max_bandwidth*.75f ? LLColor4::yellow : text_color; color[VALPHA] = text_color[VALPHA]; text = llformat("BW:%.0f/%.0f",bandwidth.value(), max_bandwidth.value()); - LLFontGL::getFontMonospace()->renderUTF8(text, 0, x_right, v_offset + line_height*2, + LLFontGL::getFontMonospace()->renderUTF8(text, 0, x_right, v_offset + line_height*3, color, LLFontGL::LEFT, LLFontGL::TOP); // Mesh status line |