diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-09 14:08:19 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-06-09 14:08:19 -0700 |
| commit | 5f53ba9af70fac74d7f80393604a9f7c723be625 (patch) | |
| tree | 3dc37c14ef6c59c131e209289b443a06984d777f | |
| parent | 781e758a6a4430d52a3cc5928187b86d92c8a485 (diff) | |
| parent | 015e0d55b3d3c54bc7323439399b2d73da6b205d (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-release
| -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; } |