Merge latest from viewer-hotfix, including fix for TOS screen

5 files changed, 43 insertions, 17 deletions

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 120b584cd9..9b5e38d0aa 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -68,15 +68,16 @@ const F32 TOTAL_LOGIN_TIME = 10.f;	// seconds, wild guess at time from GL contex
 S32 gLastStartAnimationFrame = 0;	// human-style indexing, first image = 1
 const S32 ANIMATION_FRAMES = 1; //13;
 
+static LLRegisterPanelClassWrapper<LLProgressView> r("progress_view");
+
+
 // XUI: Translate
-LLProgressView::LLProgressView(const LLRect &rect) 
+LLProgressView::LLProgressView() 
 :	LLPanel(),
 	mPercentDone( 0.f ),
 	mMouseDownInActiveArea( false ),
 	mUpdateEvents("LLProgressView")
 {
-	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_progress.xml");
-	reshape(rect.getWidth(), rect.getHeight());
 	mUpdateEvents.listen("self", boost::bind(&LLProgressView::handleUpdate, this, _1));
 }
 
@@ -92,6 +93,9 @@ BOOL LLProgressView::postBuild()
 
 	getChild<LLTextBox>("message_text")->setClickedCallback(onClickMessage, this);
 
+	// hidden initially, until we need it
+	LLPanel::setVisible(FALSE);
+
 	sInstance = this;
 	return TRUE;
 }
@@ -126,19 +130,23 @@ BOOL LLProgressView::handleKeyHere(KEY key, MASK mask)
 
 void LLProgressView::setVisible(BOOL visible)
 {
+	// hiding progress view
 	if (getVisible() && !visible)
 	{
-
 		mFadeTimer.start();
+		// hiding progress view, so show menu bars
+		LLUI::getRootView()->getChildView("menu_bar_holder")->setVisible(TRUE);
 	}
+	// showing progress view
 	else if (!getVisible() && visible)
 	{
-		gViewerWindow->addPopup(this);
-
+		// showing progress view, so hide menu bars
+		LLUI::getRootView()->getChildView("menu_bar_holder")->setVisible(FALSE);
+		
 		setFocus(TRUE);
 		mFadeTimer.stop();
 		mProgressTimer.start();
-		LLPanel::setVisible(visible);
+		LLPanel::setVisible(TRUE);
 	}
 }
 
@@ -148,7 +156,7 @@ void LLProgressView::draw()
 	static LLTimer timer;
 
 	// Paint bitmap if we've got one
-	glPushMatrix();
+	glPushMatrix();	
 	if (gStartTexture)
 	{
 		LLGLSUIDefault gls_ui;
@@ -189,7 +197,7 @@ void LLProgressView::draw()
 			// Fade is complete, release focus
 			gFocusMgr.releaseFocusIfNeeded( this );
 			LLPanel::setVisible(FALSE);
-			gViewerWindow->removePopup(this);
+			mFadeTimer.stop();
 
 			gStartTexture = NULL;
 		}
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
index 6853674d88..374b14be83 100644
--- a/indra/newview/llprogressview.h
+++ b/indra/newview/llprogressview.h
@@ -44,7 +44,7 @@ class LLProgressBar;
 class LLProgressView : public LLPanel
 {
 public:
-	LLProgressView(const LLRect& rect);
+	LLProgressView();
 	virtual ~LLProgressView();
 	
 	BOOL postBuild();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index cb6844f9df..689476f5f1 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -435,7 +435,8 @@ void init_menus()
 	gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
 	gMenuBarView->setBackgroundColor( color );
 
-	gMenuHolder->addChild(gMenuBarView);
+	LLView* menu_bar_holder = gViewerWindow->getRootView()->getChildView("menu_bar_holder");
+	menu_bar_holder->addChild(gMenuBarView);
   
     gViewerWindow->setMenuBackgroundColor(false, 
         LLViewerLogin::getInstance()->isInProductionGrid());
@@ -470,9 +471,10 @@ void init_menus()
 	gLoginMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_login.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 	gLoginMenuBarView->arrangeAndClear();
 	LLRect menuBarRect = gLoginMenuBarView->getRect();
-	gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft,  menuBarRect.mBottom));
+	menuBarRect.setLeftTopAndSize(0, menu_bar_holder->getRect().getHeight(), menuBarRect.getWidth(), menuBarRect.getHeight());
+	gLoginMenuBarView->setRect(menuBarRect);
 	gLoginMenuBarView->setBackgroundColor( color );
-	gMenuHolder->addChild(gLoginMenuBarView);
+	menu_bar_holder->addChild(gLoginMenuBarView);
 	
 	// tooltips are on top of EVERYTHING, including menus
 	gViewerWindow->getRootView()->sendChildToFront(gToolTipView);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 16b8711561..fd609637a6 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1348,7 +1348,8 @@ LLViewerWindow::LLViewerWindow(
 	mStatesDirty(false),
 	mIsFullscreenChecked(false),
 	mCurrResolutionIndex(0),
-    mViewerWindowListener(new LLViewerWindowListener(this))
+    mViewerWindowListener(new LLViewerWindowListener(this)),
+	mProgressView(NULL)
 {
 	LLNotificationChannel::buildChannel("VW_alerts", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alert"));
 	LLNotificationChannel::buildChannel("VW_alertmodal", "Visible", LLNotificationFilters::filterBy<std::string>(&LLNotification::getType, "alertmodal"));
@@ -1585,8 +1586,7 @@ void LLViewerWindow::initBase()
 	gToolTipView = getRootView()->getChild<LLToolTipView>("tooltip view");
 
 	// Add the progress bar view (startup view), which overrides everything
-	mProgressView = new LLProgressView(full_window);
-	getRootView()->addChild(mProgressView);
+	mProgressView = getRootView()->getChild<LLProgressView>("progress_view");
 	setShowProgress(FALSE);
 	setProgressCancelButtonVisible(FALSE);
 
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 85853f39bb..1ace760816 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -143,12 +143,19 @@
   <panel mouse_opaque="false"
          follows="left|right|top"
          name="status_bar_container"
-                tab_stop="false"
+         tab_stop="false"
          height="19"
          left="0" 
          top="0" 
          width="1024"
          visible="false"/>
+  <view mouse_opaque="false"
+        follows="all"
+        name="menu_bar_holder"
+        left="0"
+        top="0"
+        width="1024"
+        height="768"/>
   <notify_box_view top="0"
                    follows="all"
                    height="768"
@@ -159,6 +166,15 @@
   <panel top="0"
          follows="all"
          height="768"
+         mouse_opaque="true"
+         name="progress_view"
+         filename="panel_progress.xml" 
+         class="progress_view"
+         width="1024"
+         visible="false"/>
+  <panel top="0"
+         follows="all"
+         height="768"
          mouse_opaque="false"
          name="popup_holder"
          class="popup_holder"