diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-09 13:19:46 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-09 13:19:46 +0000 |
| commit | d0d1534e34a544a2a2acc9993421f587bb4f6ede (patch) | |
| tree | 99eb3d9b83bcbcaaedf3413aa2eecbf3cf329fbe /indra/newview/llprogressview.cpp | |
| parent | df50590145a835531a9539a96e8349f910161f53 (diff) | |
| parent | 7b029036339ae1770307ff33ccd5d540e2618748 (diff) | |
merge from viewer-2-0
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 0476e785a5..120b584cd9 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -128,11 +128,13 @@ void LLProgressView::setVisible(BOOL visible) { if (getVisible() && !visible) { + mFadeTimer.start(); } else if (!getVisible() && visible) { - gFocusMgr.setTopCtrl(this); + gViewerWindow->addPopup(this); + setFocus(TRUE); mFadeTimer.stop(); mProgressTimer.start(); @@ -187,6 +189,8 @@ void LLProgressView::draw() // Fade is complete, release focus gFocusMgr.releaseFocusIfNeeded( this ); LLPanel::setVisible(FALSE); + gViewerWindow->removePopup(this); + gStartTexture = NULL; } return; |