diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-04-29 15:28:21 +0300 |
| commit | 5f397bdd1831b1be593982ca8fc88dbe1a0cad07 (patch) | |
| tree | 1d0b8a8973a30bf3c65f09da653b0e7c009053fd /indra/llui/lltextbase.cpp | |
| parent | 1382e9bae647d6b548cd9a1fc78339e5929ea202 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge from viewer-release
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rwxr-xr-x | indra/llui/lltextbase.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index eca57d1c23..602a703450 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -38,7 +38,6 @@ #include "lltextutil.h" #include "lltooltip.h" #include "lluictrl.h" -#include "lluriparser.h" #include "llurlaction.h" #include "llurlregistry.h" #include "llview.h" @@ -1557,7 +1556,7 @@ void LLTextBase::reflow() line_count)); line_start_index = segment->getStart() + seg_offset; - cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels; + cur_top -= ll_round((F32)line_height * mLineSpacingMult) + mLineSpacingPixels; remaining_pixels = text_available_width; line_height = 0; } @@ -1569,7 +1568,7 @@ void LLTextBase::reflow() last_segment_char_on_line, line_rect, line_count)); - cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels; + cur_top -= ll_round((F32)line_height * mLineSpacingMult) + mLineSpacingPixels; break; } // ...or finished a segment and there are segments remaining on this line @@ -1584,7 +1583,7 @@ void LLTextBase::reflow() line_rect, line_count)); line_start_index = segment->getStart() + seg_offset; - cur_top -= llround((F32)line_height * mLineSpacingMult) + mLineSpacingPixels; + cur_top -= ll_round((F32)line_height * mLineSpacingMult) + mLineSpacingPixels; line_height = 0; remaining_pixels = text_available_width; } |