diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-10-28 17:09:13 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-10-28 17:09:13 -0700 |
| commit | 9426de7e10fa7cfe84048ae7dd58a793e981ee33 (patch) | |
| tree | 3f08086776a8175741f23071333b593992269c45 /indra/newview/llnavigationbar.cpp | |
| parent | a0e766da94d786d306a86667a27728524ca6eedb (diff) | |
| parent | 74e70f2f23901d524350252519beaef8ed6d42e5 (diff) | |
merging...
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 992e244ed9..c32ef2f22b 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -164,16 +164,7 @@ TODO: - Load navbar height from saved settings (as it's done for status bar) or think of a better way. */ -S32 NAVIGATION_BAR_HEIGHT = 60; // *HACK -LLNavigationBar* LLNavigationBar::sInstance = 0; - -LLNavigationBar* LLNavigationBar::getInstance() -{ - if (!sInstance) - sInstance = new LLNavigationBar(); - - return sInstance; -} +S32 NAVIGATION_BAR_HEIGHT = 60; // *HACK, used in llviewerwindow.cpp LLNavigationBar::LLNavigationBar() : mTeleportHistoryMenu(NULL), @@ -198,8 +189,6 @@ LLNavigationBar::LLNavigationBar() LLNavigationBar::~LLNavigationBar() { mTeleportFinishConnection.disconnect(); - sInstance = 0; - LLSearchHistory::getInstance()->save(); } @@ -622,6 +611,9 @@ void LLNavigationBar::showNavigationPanel(BOOL visible) } } + childSetVisible("bg_icon", fpVisible); + childSetVisible("bg_icon_no_fav", !fpVisible); + if(LLSideTray::instanceCreated()) { LLSideTray::getInstance()->resetPanelRect(); @@ -686,6 +678,9 @@ void LLNavigationBar::showFavoritesPanel(BOOL visible) setRect(nbRect); } + childSetVisible("bg_icon", visible); + childSetVisible("bg_icon_no_fav", !visible); + fb->setVisible(visible); if(LLSideTray::instanceCreated()) { |