diff options
| author | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-08 13:41:40 -0700 |
| commit | de78d17e912b7e2a4c563a7a428f11cce33644c0 (patch) | |
| tree | 6c415389f180f6a5d879b050670fd6cd3d987229 /indra/llui/lllineeditor.cpp | |
| parent | 888b39c283e53fd128778e70e231bcb6053de4b8 (diff) | |
| parent | 1361eeae4e4538c175a32d48246897c4659cc26c (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index d99ee5a545..0196080d90 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -389,7 +389,11 @@ void LLLineEditor::setText(const LLStringExplicit &new_text) setCursor(llmin((S32)mText.length(), getCursor())); // Set current history line to end of history. - if(mLineHistory.end() != mLineHistory.begin()) + if (mLineHistory.empty()) + { + mCurrentHistoryLine = mLineHistory.end(); + } + else { mCurrentHistoryLine = mLineHistory.end() - 1; } |