summaryrefslogtreecommitdiff
path: root/indra/newview/llmemoryview.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-03-13 14:50:20 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-03-13 14:50:20 -0700
commit629ec1d54d16549d42198a9ac83a33bb9b51ab22 (patch)
tree2c1d558742f0d46c2277883de4de094dcabcb7f3 /indra/newview/llmemoryview.cpp
parent9aa0c58c20f8d60dc2f674ce1eaa805db8f599c8 (diff)
parent1c812c3c6734197835fd8cfaef286f1ad444ec64 (diff)
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/llmemoryview.cpp')
-rw-r--r--indra/newview/llmemoryview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp
index 7e9c3c84a7..c0a323d6cb 100644
--- a/indra/newview/llmemoryview.cpp
+++ b/indra/newview/llmemoryview.cpp
@@ -220,7 +220,7 @@ void LLMemoryView::draw()
S32 x, y;
S32 margin = 10;
- S32 texth = (S32)LLFontGL::getFontMonospace()->getLineHeight();
+ S32 texth = LLFontGL::getFontMonospace()->getLineHeight();
S32 xleft = margin;
S32 ytop = height - margin;