diff options
| author | Richard Linden <none@none> | 2010-05-28 16:55:58 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-05-28 16:55:58 -0700 |
| commit | efdfc298d426abe8e1fd129c13900a2b4314353f (patch) | |
| tree | b31f77d52e3eeb41e9e62914a251f02a6a7d1020 /indra/llui | |
| parent | 8ec4f45daa93ca1acc5e45df2def1b84397127e8 (diff) | |
| parent | 2703125698914e1f2f440b94ac03902f218ebc38 (diff) | |
Merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 78a6ab1eaa..0e542ad05c 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -962,19 +962,8 @@ void LLTextBase::reshape(S32 width, S32 height, BOOL called_from_parent) { if (width != getRect().getWidth() || height != getRect().getHeight()) { - //EXT-4288 - //to keep consistance scrolling behaviour - //when scrolling from top and from bottom... - bool is_scrolled_to_end = (mScroller!=NULL) && scrolledToEnd(); - LLUICtrl::reshape( width, height, called_from_parent ); - if (is_scrolled_to_end) - { - deselect(); - endOfDoc(); - } - // do this first after reshape, because other things depend on // up-to-date mVisibleTextRect updateRects(); @@ -1858,7 +1847,7 @@ S32 LLTextBase::getDocIndexFromLocalCoord( S32 local_x, S32 local_y, BOOL round, pos = segment_line_start; break; } - if (local_x < start_x + text_width // cursor to left of right edge of text + if (local_x < start_x + text_width // cursor to left of right edge of text || newline) // or this line ends with a newline, set doc pos to newline char { // Figure out which character we're nearest to. |