diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2010-11-17 13:25:32 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2010-11-17 13:25:32 -0800 |
| commit | 3a36ed079c0dec55efe9622d9ff86ae932ef9ed5 (patch) | |
| tree | b298908a2ac37250a4eb3bf3a550c6f3543f05c0 /indra/llui/lltextbase.cpp | |
| parent | cde71466ec4a2eb562d3316c3dafb38b8a7b0629 (diff) | |
| parent | 669d10a4ee4c9cb2d6860126740f07b0ee90f29b (diff) | |
Merge with viewer-development
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()); } |