From 9abe9bf5dffeade7adbae99b3d5f7c9030fba0e5 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 17 Dec 2009 11:44:01 -0800 Subject: clamp instead of assert when running out of room during reflow --- indra/llui/lltextbase.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llui') diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 6c983fd92e..4426bf5ddd 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1137,6 +1137,10 @@ void LLTextBase::reflow(S32 start_index) // grow line height as necessary based on reported height of this segment line_height = llmax(line_height, segment_height); remaining_pixels -= segment_width; + if (remaining_pixels < 0) + { + remaining_pixels = 0; + } // getNumChars() and getDimensions() should return consistent results llassert_always(remaining_pixels >= 0); -- cgit v1.2.3