diff options
author | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 11:44:40 -0700 |
commit | 0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (patch) | |
tree | a485d28fd9861c41bf9b7117c085bd84617f43de /indra/llui/lltextbase.cpp | |
parent | dd4beb695a9c800b37b7c9a19d3ac3f4456012f5 (diff) | |
parent | badb8a945d31aed6f396e7efb521e76083870069 (diff) |
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rwxr-xr-x | indra/llui/lltextbase.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 3c284b3f03..cc171661ce 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2379,7 +2379,6 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, { // Figure out which line we're nearest to. LLRect doc_rect = mDocumentView->getRect(); - S32 doc_y = local_y - doc_rect.mBottom; // binary search for line that starts before local_y |