aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprogressview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llprogressview.cpp
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/newview/llprogressview.cpp')
-rw-r--r--linden/indra/newview/llprogressview.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp
index dd75c3f..71a1d66 100644
--- a/linden/indra/newview/llprogressview.cpp
+++ b/linden/indra/newview/llprogressview.cpp
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2002-2007, Linden Research, Inc. 5 * Copyright (c) 2002-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -61,7 +62,7 @@ const S32 ANIMATION_FRAMES = 1; //13;
61 62
62// XUI:translate 63// XUI:translate
63LLProgressView::LLProgressView(const std::string& name, const LLRect &rect) 64LLProgressView::LLProgressView(const std::string& name, const LLRect &rect)
64: LLView(name, rect, TRUE) 65: LLPanel(name, rect, FALSE)
65{ 66{
66 mPercentDone = 0.f; 67 mPercentDone = 0.f;
67 mDrawBackground = TRUE; 68 mDrawBackground = TRUE;
@@ -138,7 +139,7 @@ void LLProgressView::setVisible(BOOL visible)
138 } 139 }
139 else if (!getVisible() && visible) 140 else if (!getVisible() && visible)
140 { 141 {
141 gFocusMgr.setTopView(this, NULL); 142 gFocusMgr.setTopCtrl(this);
142 mFadeTimer.stop(); 143 mFadeTimer.stop();
143 mProgressTimer.start(); 144 mProgressTimer.start();
144 LLView::setVisible(visible); 145 LLView::setVisible(visible);
@@ -202,7 +203,7 @@ void LLProgressView::draw()
202 LLView::draw(); 203 LLView::draw();
203 if (mFadeTimer.getElapsedTimeF32() > FADE_IN_TIME) 204 if (mFadeTimer.getElapsedTimeF32() > FADE_IN_TIME)
204 { 205 {
205 gFocusMgr.removeTopViewWithoutCallback(this); 206 gFocusMgr.removeTopCtrlWithoutCallback(this);
206 LLView::setVisible(FALSE); 207 LLView::setVisible(FALSE);
207 gStartImageGL = NULL; 208 gStartImageGL = NULL;
208 } 209 }