diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-10 14:21:11 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-06-10 14:21:11 +0300 |
commit | 0b2e17775f264ac88fb8f21184a7bfcd54ebe026 (patch) | |
tree | 2d74aeee65b3251991545a341f7fd55538f0fa51 /indra/llui | |
parent | a61c8d2272ee709595655024d57a41bfa1ed5354 (diff) | |
parent | 5f53ba9af70fac74d7f80393604a9f7c723be625 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/lllineeditor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index 45f9de8e8d..c93ca1af88 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -377,7 +377,10 @@ void LLLineEditor::setText(const LLStringExplicit &new_text) setCursor(llmin((S32)mText.length(), getCursor())); // Set current history line to end of history. - mCurrentHistoryLine = mLineHistory.end() - 1; + if(mLineHistory.end() != mLineHistory.begin()) + { + mCurrentHistoryLine = mLineHistory.end() - 1; + } mPrevText = mText; } |