diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 14:47:43 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 14:47:43 +0100 |
commit | 3c47d1faf1abb38ad05036de65bea3b7e21f683f (patch) | |
tree | 2a33d4ee90d0287436c63a5f8fa90cf8fd1d6ef6 /indra/llrender/llfontgl.cpp | |
parent | 20c660569df71f677065b5f5f66477ebbd6b35b6 (diff) | |
parent | a63c59be9e7df57143ddd04e44263c232f420a21 (diff) |
another hairy merge from viewer-trunk :(
Diffstat (limited to 'indra/llrender/llfontgl.cpp')
-rw-r--r-- | indra/llrender/llfontgl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index d9e1976341..82db922368 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -247,7 +247,6 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons } } - const LLFontGlyphInfo* next_glyph = NULL; for (i = begin_offset; i < begin_offset + length; i++) |