diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-03-24 10:29:23 +0200 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-03-24 10:29:23 +0200 |
| commit | 44045a233b969b0a352100d8e46ca1aafc9cf5e1 (patch) | |
| tree | b1a362dea9025a13504773be4605ca02ec528994 | |
| parent | 671873287e28258dd42cf6abd22057f547f77331 (diff) | |
MAINT-807 FIXED ([PUBLIC]Button Clear history from Preferences isn't clear last teleport)
- The order of clearing LLTeleportHistory and LLTeleportHistoryStorage does matter:
first LLTeleportHistory must be cleared after LLTeleportHistoryStorage.
Clearing LLTeleportHistory from LLNavigationBar::draw() breaks this order (see callback_clear_browser_cache)
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llnavigationbar.h | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 2a08cb1845..95caa2731a 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -267,7 +267,6 @@ LLNavigationBar::LLNavigationBar() mBtnForward(NULL), mBtnHome(NULL), mCmbLocation(NULL), - mPurgeTPHistoryItems(false), mSaveToLocationHistory(false) { buildFromFile( "panel_navigation_bar.xml"); @@ -338,12 +337,6 @@ void LLNavigationBar::setVisible(BOOL visible) void LLNavigationBar::draw() { - if(mPurgeTPHistoryItems) - { - LLTeleportHistory::getInstance()->purgeItems(); - mPurgeTPHistoryItems = false; - } - if (isBackgroundVisible()) { static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0); @@ -687,7 +680,7 @@ void LLNavigationBar::clearHistoryCache() LLLocationHistory* lh = LLLocationHistory::getInstance(); lh->removeItems(); lh->save(); - mPurgeTPHistoryItems= true; + LLTeleportHistory::getInstance()->purgeItems(); } int LLNavigationBar::getDefNavBarHeight() diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index e4ce9e3998..7878bab24e 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -145,7 +145,6 @@ private: boost::signals2::connection mTeleportFailedConnection; boost::signals2::connection mTeleportFinishConnection; boost::signals2::connection mHistoryMenuConnection; - bool mPurgeTPHistoryItems; // if true, save location to location history when teleport finishes bool mSaveToLocationHistory; }; |