diff options
author | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
commit | 864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch) | |
tree | de5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/newview/llteleporthistory.cpp | |
parent | 5d4959e3a107a6a40014528dd8e17e46bf128540 (diff) | |
parent | 7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff) |
merge
Diffstat (limited to 'indra/newview/llteleporthistory.cpp')
-rw-r--r-- | indra/newview/llteleporthistory.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp index cc4689062e..1315887c37 100644 --- a/indra/newview/llteleporthistory.cpp +++ b/indra/newview/llteleporthistory.cpp @@ -167,7 +167,10 @@ void LLTeleportHistory::onHistoryChanged() void LLTeleportHistory::purgeItems() { - mItems.erase(mItems.begin(), mItems.end()-1); + if (mItems.size() > 0) + { + mItems.erase(mItems.begin(), mItems.end()-1); + } // reset the count mRequestedItem = -1; mCurrentItem = 0; |