summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-11-26 09:31:55 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-11-26 09:31:55 +0200
commit4c81e7a85c3fe69f16ac3996df732627dda8533a (patch)
tree25af0dff630ae8d5cbf5e572c8286122ebaf79a7 /indra/llui/lltextbase.cpp
parent1533f3d2a6fcbfd1550b3840c2d2327283f131c0 (diff)
parentb19b63ad8cba7b1c3e44c4084313103765af1917 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp5
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();
}