1. simon_linden
  2. viewer-rabbit

Commits

Vadim Savchuk  committed 6ca6ca8

EXP-1593 FIXED Navbar was displayed after exitting hide contorls mode, even if disabled via settings.

Apparently, the way we showed/hid the panels was wrong.

  • Participants
  • Parent commits aab0748
  • Branches default

Comments (0)

Files changed (1)

File indra/newview/llviewerwindow.cpp

View file
 #include "llmorphview.h"
 #include "llmoveview.h"
 #include "llnavigationbar.h"
+#include "llpaneltopinfobar.h"
 #include "llpopupview.h"
 #include "llpreviewtexture.h"
 #include "llprogressview.h"
 		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);
 }