summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontgl.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-12 12:10:24 -0400
committerOz Linden <oz@lindenlab.com>2013-04-12 12:10:24 -0400
commitedf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch)
tree68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/llrender/llfontgl.cpp
parent01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff)
parent460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff)
pull changes for Sunshine beta
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r--indra/llrender/llfontgl.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 8772779645..c4f36cabd0 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -541,7 +541,6 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
BOOL clip = FALSE;
F32 cur_x = 0;
- F32 drawn_x = 0;
S32 start_of_last_word = 0;
BOOL in_word = FALSE;
@@ -629,7 +628,6 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
// Round after kerning.
cur_x = (F32)llround(cur_x);
- drawn_x = cur_x;
}
if( clip )