Pull and merge from https://bitbucket.org/lindenlab/viewer-development.

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 76dd20f475..53ac206576 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -130,6 +130,7 @@
 #include "llmorphview.h"

 #include "llmoveview.h"

 #include "llnavigationbar.h"

+#include "llpaneltopinfobar.h"

 #include "llpopupview.h"

 #include "llpreviewtexture.h"

 #include "llprogressview.h"

@@ -979,7 +980,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK
 		return TRUE;

 	}

 	

-	

+

 	// If we got this far on a down-click, it wasn't handled.

 	// Up-clicks, though, are always handled as far as the OS is concerned.

 	BOOL default_rtn = !down;

@@ -5028,8 +5029,8 @@ void LLViewerWindow::setUIVisibility(bool visible)
 		gToolBarView->setToolBarsVisible(visible);

 	}

 

-	mRootView->getChildView("topinfo_bar_container")->setVisible(visible);

-	mRootView->getChildView("nav_bar_container")->setVisible(visible);

+	LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);

+	LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE);

 	mRootView->getChildView("status_bar_container")->setVisible(visible);

 }