summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2011-09-22 13:27:59 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2011-09-22 13:27:59 +0300
commitcdba1674c5293f5d55c059ada18eb1a1b75cf1e8 (patch)
tree5773a2fc6a5558c642ecc30826d88ad6b4c51c65 /indra/newview/llagent.cpp
parent00ba099a9e23103900399803ffc375873fbfe4a3 (diff)
EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and favorites to be on one line)
- Changed member variable name mChevronButton to mMoreTextBox - Fixed some bugs which PE testers have found: 1. Parcel characteristics icons from location bar overlay other ui elements 2. Navigation & Favorites bar are displayed after exitting mouselook mode although 'Show Navigation & Favorites bar' is unchecked
Diffstat (limited to 'indra/newview/llagent.cpp')
-rwxr-xr-xindra/newview/llagent.cpp2
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"))