diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-27 18:56:25 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-27 18:56:25 -0700 |
| commit | 3a473bd8ca301a5cd7e0284e40da890d598d394d (patch) | |
| tree | 1908ddb38b5000aa057e9c3e19fd991a7df7e4b2 /indra/newview/llviewerwindow.cpp | |
| parent | 442350a6a5ef1537f2998796c61b0f1053b455c8 (diff) | |
| parent | 87db6c59ee2ac5f8cc304d6f8150af5f91e3fb8d (diff) | |
EXP-1203, EXP-1221, EXP-1222, EXP-1223, EXP-1225, EXP-1226 : pull from sergeylproductengine/viewer-experience-fui/
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 6d69932e93..7c930b80c2 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1899,12 +1899,7 @@ void LLViewerWindow::initWorldUI() if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel")) { - navbar->showNavigationPanel(FALSE); - } - - if (!gSavedSettings.getBOOL("ShowNavbarFavoritesPanel")) - { - navbar->showFavoritesPanel(FALSE); + navbar->setVisible(FALSE); } // Top Info bar @@ -2198,7 +2193,9 @@ void LLViewerWindow::setNormalControlsVisible( BOOL visible ) LLNavigationBar* navbarp = LLUI::getRootView()->findChild<LLNavigationBar>("navigation_bar"); if (navbarp) { - navbarp->setVisible( visible ); + // when it's time to show navigation bar we need to ensure that the user wants to see it + // i.e. ShowNavbarNavigationPanel option is true + navbarp->setVisible( visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel") ); } } |