diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:58:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-19 15:58:53 -0500 |
| commit | f6ba55b8ed24246be340d069c64d25bd614194a6 (patch) | |
| tree | 3475f87a3326be076158597ecc7e96f341080f2f /indra/llui/lltextbase.cpp | |
| parent | 3b85391839da9077129830258d4a1d1ce6069cb3 (diff) | |
| parent | 0f72f152e88efd7fc56cf6764f25bd2d0d4bf062 (diff) | |
merge fix for STORM-138
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 5721df6b36..3f213ed13e 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()); } |