diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
| commit | 569f322f0d43ba4e1f079d362d333af5b84a0e32 (patch) | |
| tree | 7141309c52129400982944d1f91667b74d65c6cb /indra/llui/lltextbase.cpp | |
| parent | 8421d3dcd3aad07efecbfa490ccc8e71119b9cab (diff) | |
| parent | b98ebdecda66a1f08e74321cb255e39edfbc47dd (diff) | |
PE merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 5f4b16ec9e..56d7a63832 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -962,7 +962,18 @@ 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 |