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/llagent.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/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 642a1907f0..1587ed2dd7 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1797,7 +1797,7 @@ void LLAgent::endAnimationUpdateUI() gViewerWindow->showCursor(); // show menus gMenuBarView->setVisible(TRUE); - LLNavigationBar::getInstance()->setVisible(TRUE); + LLNavigationBar::getInstance()->setVisible(TRUE && gSavedSettings.getBOOL("ShowNavbarNavigationPanel")); gStatusBar->setVisibleForMouselook(true); if (gSavedSettings.getBOOL("ShowMiniLocationPanel")) |