diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-04 20:47:17 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-04 20:47:17 +0200 |
commit | 67ff38b51b59766ff7bc0af1e541b54ac067ea70 (patch) | |
tree | d204b5b656911187d12b08b8ed77a873f9758b4d /indra/newview/llteleporthistory.cpp | |
parent | c28fd45839b0a1924c80bc289a90e4756e677472 (diff) | |
parent | ae6911d094bcfaa730fd77f3c55c9ea5fa02b229 (diff) |
merge
--HG--
branch : product-engine
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; |