summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorrichard <none@none>2009-12-17 11:44:37 -0800
committerrichard <none@none>2009-12-17 11:44:37 -0800
commit49a037048ca733f0a84186e3cfb0f6f0b0b55df8 (patch)
tree1fb9ab077b61f03cf0f502ab57192a5a0198fd24 /indra
parent9abe9bf5dffeade7adbae99b3d5f7c9030fba0e5 (diff)
oops, forgot to remove assert
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/lltextbase.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 4426bf5ddd..cb0907a771 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1139,11 +1139,10 @@ void LLTextBase::reflow(S32 start_index)
remaining_pixels -= segment_width;
if (remaining_pixels < 0)
{
+ // getNumChars() and getDimensions() should return consistent results
remaining_pixels = 0;
}
- // getNumChars() and getDimensions() should return consistent results
- llassert_always(remaining_pixels >= 0);
seg_offset += character_count;
S32 last_segment_char_on_line = segment->getStart() + seg_offset;