summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-08-02 17:19:09 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-08-02 17:19:09 -0400
commitc7b2a88875e21f7610dd3e7c5d3f528b28d5ab55 (patch)
treea4408b6bdfed37a95f69e16dcab17673cefb6f32 /indra/llui
parent9883c33993f7a548c876b43494ffd5835473a211 (diff)
parent9eb555bbe60e0f388593c489d6c473e4adcbd956 (diff)
pulling latest viewer-development into mesh merge branch.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lltextbase.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 349dbc3405..919364be63 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2024,8 +2024,17 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round,
}
else if (hit_past_end_of_line && segmentp->getEnd() >= line_iter->mDocIndexEnd)
{
- // segment wraps to next line, so just set doc pos to the end of the line
- pos = llclamp(line_iter->mDocIndexEnd - 1, 0, getLength());
+ if (getLineNumFromDocIndex(line_iter->mDocIndexEnd - 1) == line_iter->mLineNum)
+ {
+ // if segment wraps to the next line we should step one char back
+ // to compensate for the space char between words
+ // which is removed due to wrapping
+ pos = llclamp(line_iter->mDocIndexEnd - 1, 0, getLength());
+ }
+ else
+ {
+ pos = llclamp(line_iter->mDocIndexEnd, 0, getLength());
+ }
break;
}
start_x += text_width;