Issue #71 Login failures cause growing black zone in the top

3 files changed, 54 insertions, 24 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 7abf9f8bc2..390890706e 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2991,6 +2991,11 @@ void reset_login()
 
 	// Hide any other stuff
 	LLFloaterReg::hideVisibleInstances();
+
+    if (LLStartUp::getStartupState() > STATE_WORLD_INIT)
+    {
+        gViewerWindow->resetStatusBarContainer();
+    }
     LLStartUp::setStartupState( STATE_BROWSER_INIT );
 
     if (LLVoiceClient::instanceExists())
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f661887c65..349847c57a 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2180,31 +2180,40 @@ void LLViewerWindow::initWorldUI()
 	// Force gFloaterTools to initialize
 	LLFloaterReg::getInstance("build");
 
-	// Status bar
-	LLPanel* status_bar_container = getRootView()->getChild<LLPanel>("status_bar_container");
-	gStatusBar = new LLStatusBar(status_bar_container->getLocalRect());
-	gStatusBar->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP | FOLLOWS_RIGHT);
-	gStatusBar->setShape(status_bar_container->getLocalRect());
-	// sync bg color with menu bar
-	gStatusBar->setBackgroundColor( gMenuBarView->getBackgroundColor().get() );
-    // add InBack so that gStatusBar won't be drawn over menu
-    status_bar_container->addChildInBack(gStatusBar, 2/*tab order, after menu*/);
-    status_bar_container->setVisible(TRUE);
-
-	// Navigation bar
-	LLView* nav_bar_container = getRootView()->getChild<LLView>("nav_bar_container");
-
-	LLNavigationBar* navbar = LLNavigationBar::getInstance();
-	navbar->setShape(nav_bar_container->getLocalRect());
-	navbar->setBackgroundColor(gMenuBarView->getBackgroundColor().get());
-	nav_bar_container->addChild(navbar);
-	nav_bar_container->setVisible(TRUE);
-
+    LLNavigationBar* navbar = LLNavigationBar::getInstance();
+    if (!gStatusBar)
+    {
+        // Status bar
+        LLPanel* status_bar_container = getRootView()->getChild<LLPanel>("status_bar_container");
+        gStatusBar = new LLStatusBar(status_bar_container->getLocalRect());
+        gStatusBar->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP | FOLLOWS_RIGHT);
+        gStatusBar->setShape(status_bar_container->getLocalRect());
+        // sync bg color with menu bar
+        gStatusBar->setBackgroundColor(gMenuBarView->getBackgroundColor().get());
+        // add InBack so that gStatusBar won't be drawn over menu
+        status_bar_container->addChildInBack(gStatusBar, 2/*tab order, after menu*/);
+        status_bar_container->setVisible(TRUE);
+
+        // Navigation bar
+        LLView* nav_bar_container = getRootView()->getChild<LLView>("nav_bar_container");
+
+        navbar->setShape(nav_bar_container->getLocalRect());
+        navbar->setBackgroundColor(gMenuBarView->getBackgroundColor().get());
+        nav_bar_container->addChild(navbar);
+        nav_bar_container->setVisible(TRUE);
+    }
+    else
+    {
+        LLPanel* status_bar_container = getRootView()->getChild<LLPanel>("status_bar_container");
+        LLView* nav_bar_container = getRootView()->getChild<LLView>("nav_bar_container");
+        status_bar_container->setVisible(TRUE);
+        nav_bar_container->setVisible(TRUE);
+    }
 
-	if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
-	{
-		navbar->setVisible(FALSE);
-	}
+    if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
+    {
+        navbar->setVisible(FALSE);
+    }
     else
     {
         reshapeStatusBarContainer();
@@ -6041,6 +6050,21 @@ void LLViewerWindow::reshapeStatusBarContainer()
     }
     status_bar_container->reshape(new_width, new_height, TRUE);
 }
+
+void LLViewerWindow::resetStatusBarContainer()
+{
+    LLNavigationBar* navbar = LLNavigationBar::getInstance();
+    if (gSavedSettings.getBOOL("ShowNavbarNavigationPanel") || navbar->getVisible())
+    {
+        // was previously showing navigation bar
+        LLView* nav_bar_container = getRootView()->getChild<LLView>("nav_bar_container");
+        LLPanel* status_bar_container = getRootView()->getChild<LLPanel>("status_bar_container");
+        S32 new_height = status_bar_container->getRect().getHeight();
+        S32 new_width = status_bar_container->getRect().getWidth();
+        new_height -= nav_bar_container->getRect().getHeight();
+        status_bar_container->reshape(new_width, new_height, TRUE);
+    }
+}
 //----------------------------------------------------------------------------
 
 
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index ccef006a07..96c5c3115a 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -182,6 +182,7 @@ public:
 	void			handlePieMenu(S32 x, S32 y, MASK mask);
 
     void            reshapeStatusBarContainer();
+    void            resetStatusBarContainer(); // undo changes done by resetStatusBarContainer on initWorldUI()
 
 	BOOL handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down, bool &is_toolmgr_action);