diff options
| author | Kyle Ambroff <ambroff@lindenlab.com> | 2010-10-21 15:56:13 -0700 |
|---|---|---|
| committer | Kyle Ambroff <ambroff@lindenlab.com> | 2010-10-21 15:56:13 -0700 |
| commit | f940b49d0fdcca8efc7d1bdfc7eed2ce65a14767 (patch) | |
| tree | a4aed245d3acadc61c6110b20956be7de6a772f4 /indra/llui/lltextbase.cpp | |
| parent | e7b2c475d898a90c9e1c458cfbffbe15aacc7ad0 (diff) | |
| parent | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (diff) | |
Merge with andrew
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 758df418e8..04292eff84 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1591,7 +1591,10 @@ void LLTextBase::setText(const LLStringExplicit &utf8str, const LLStyle::Params& // appendText modifies mCursorPos... appendText(text, false, input_params); // ...so move cursor to top after appending text - startOfDoc(); + if (!mTrackEnd) + { + startOfDoc(); + } onValueChange(0, getLength()); } |