diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-25 15:46:30 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-25 15:46:30 +0200 |
| commit | f0e3eec40be91558efdae3051f42fa32f306207c (patch) | |
| tree | 36ba3eb7516b60c0fb6a4aba6aa3b9c3b7ed8e24 /indra/llui/lltextbase.cpp | |
| parent | c2c83f3535c5a0bc099528580375afc99ad3b020 (diff) | |
| parent | 41eb231e6a41da13549e5cbd4cfe6f5efeab74b1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index ab1006ffd7..7bf10d774c 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -60,6 +60,11 @@ LLTextBase::line_info::line_info(S32 index_start, S32 index_end, LLRect rect, S3 bool LLTextBase::compare_segment_end::operator()(const LLTextSegmentPtr& a, const LLTextSegmentPtr& b) const { + // sort empty spans (e.g. 11-11) after previous non-empty spans (e.g. 5-11) + if (a->getEnd() == b->getEnd()) + { + return a->getStart() < b->getStart(); + } return a->getEnd() < b->getEnd(); } |