From ea8fb7238e6f12383ee4bc081475fa6235637581 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Sat, 31 Mar 2007 01:41:19 +0000
Subject: svn merge -r 59364:59813
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/llprogressview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llprogressview.cpp')

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 1172bd8cf0..3bfe913ab4 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -42,7 +42,7 @@ const S32 ANIMATION_FRAMES = 1; //13;
 
 // XUI:translate
 LLProgressView::LLProgressView(const std::string& name, const LLRect &rect) 
-: LLView(name, rect, TRUE)
+: LLPanel(name, rect, FALSE)
 {
 	mPercentDone = 0.f;
 	mDrawBackground = TRUE;
@@ -119,7 +119,7 @@ void LLProgressView::setVisible(BOOL visible)
 	}
 	else if (!getVisible() && visible)
 	{
-		gFocusMgr.setTopView(this, NULL);
+		gFocusMgr.setTopCtrl(this);
 		mFadeTimer.stop();
 		mProgressTimer.start();
 		LLView::setVisible(visible);
@@ -183,7 +183,7 @@ void LLProgressView::draw()
 		LLView::draw();
 		if (mFadeTimer.getElapsedTimeF32() > FADE_IN_TIME)
 		{
-			gFocusMgr.removeTopViewWithoutCallback(this);
+			gFocusMgr.removeTopCtrlWithoutCallback(this);
 			LLView::setVisible(FALSE);
 			gStartImageGL = NULL;
 		}
-- 
cgit v1.2.3