diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-02 14:52:12 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-02 14:52:12 -0500 |
| commit | a25f8987032afede673b818fe7544975eba036b5 (patch) | |
| tree | cfa15a82661d407fd9f2031e7dfd6f7e0be48bb2 /indra/llui/lllineeditor.cpp | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
| parent | 43083743747bece13301e2789ab36ed7e4886aba (diff) | |
merge
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; } |