summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-06 11:18:04 -0800
committerrichard <none@none>2010-01-06 11:18:04 -0800
commit3b7080a6b112c492a9025ae1a350db0ab4e88e50 (patch)
treeace6c115385bcffb6dbea26d0ef31be3632a708a /indra/llrender
parentfd899d4ed6933d2bce10eef31ce0c99e1272afcb (diff)
parent1bbd259f2d009a807a09aea15d01d0872f8b1cad (diff)
merge
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llfontgl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 37a28ac721..d3497c1c23 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -562,7 +562,7 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
drawn_x = cur_x;
}
- if( clip && end_on_word_boundary && (start_of_last_word != 0) )
+ if( clip && end_on_word_boundary )
{
i = start_of_last_word;
}