summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-10 17:21:11 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-10 17:21:11 +0300
commita797948a18d3f09244348526852524527f3f8e27 (patch)
tree7531629b93a27e09e00cb4539385564566a48a08 /indra/llui
parent591aa0d5be809a8ce0ba314493a9c3a8dfee8b9b (diff)
parentac9543be9eb6e3c4b929142d0d2758ebf1885ac8 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lllineeditor.cpp5
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;
}