diff options
| author | Christian Goetze <cg@lindenlab.com> | 2009-03-13 21:28:40 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2009-03-13 21:28:40 +0000 |
| commit | 1aa0416aef379bb3ad1012441588b6d7fab81b40 (patch) | |
| tree | 14a247470bd0d508aba923dc00e940b961d304da /indra/newview/llmemoryview.cpp | |
| parent | 7573288ab3ede23f97bff2f5caefcb622e7e9842 (diff) | |
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
Diffstat (limited to 'indra/newview/llmemoryview.cpp')
| -rw-r--r-- | indra/newview/llmemoryview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp index 97dc373b07..215cc6940b 100644 --- a/indra/newview/llmemoryview.cpp +++ b/indra/newview/llmemoryview.cpp @@ -156,7 +156,7 @@ void LLMemoryView::draw() S32 x, y; S32 margin = 10; - S32 texth = (S32)LLFontGL::sMonospace->getLineHeight(); + S32 texth = (S32)LLFontGL::getFontMonospace()->getLineHeight(); S32 xleft = margin; S32 ytop = height - margin; @@ -204,11 +204,11 @@ void LLMemoryView::draw() S32 mbytes = bytes >> 20; tdesc = llformat("%s [%4d MB] in %06d NEWS",mtv_display_table[i].desc,mbytes, LLMemType::sNewCount[tidx]); - LLFontGL::sMonospace->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP); + LLFontGL::getFontMonospace()->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP); y -= (texth + 2); - S32 textw = LLFontGL::sMonospace->getWidth(tdesc); + S32 textw = LLFontGL::getFontMonospace()->getWidth(tdesc); if (textw > labelwidth) labelwidth = textw; } @@ -230,7 +230,7 @@ void LLMemoryView::draw() tdesc = llformat("Total Bytes: %d MB Overhead: %d KB Avs %d Motions:%d Loading:%d Loaded:%d Active:%d Dep:%d", LLMemType::sTotalMem >> 20, LLMemType::sOverheadMem >> 10, num_avatars, num_motions, num_loading_motions, num_loaded_motions, num_active_motions, num_deprecated_motions); - LLFontGL::sMonospace->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP); + LLFontGL::getFontMonospace()->renderUTF8(tdesc, 0, x, y, LLColor4::white, LLFontGL::LEFT, LLFontGL::TOP); } // Bars |