diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-03 12:49:38 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-02-03 12:49:38 +0200 |
| commit | 19ba010137a2b43759cbe5d871fb430784e15db2 (patch) | |
| tree | f221c3eb4a915944e836dc1afbccb4d5076fd4d0 /indra/newview | |
| parent | 02a896a138beb892ec218c36296f60fb859f440a (diff) | |
Fixed low bug EXT-4802 - Clearing whole teleport history doesn't clear TP history from nav bar
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelteleporthistory.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llteleporthistory.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index 43e0f9a88c..90c8f2551f 100644 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -940,6 +940,9 @@ bool LLTeleportHistoryPanel::onClearTeleportHistoryDialog(const LLSD& notificati if (0 == option) { + // order does matter, call this first or teleport history will contain one record(current location) + LLTeleportHistory::getInstance()->purgeItems(); + LLTeleportHistoryStorage *th = LLTeleportHistoryStorage::getInstance(); th->purgeItems(); th->save(); diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp index ce00dec802..dcc85392f7 100644 --- a/indra/newview/llteleporthistory.cpp +++ b/indra/newview/llteleporthistory.cpp @@ -173,6 +173,8 @@ void LLTeleportHistory::purgeItems() // reset the count mRequestedItem = -1; mCurrentItem = 0; + + onHistoryChanged(); } // static |