diff options
| author | Richard Linden <none@none> | 2010-03-05 14:46:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-05 14:46:00 -0800 |
| commit | 931ff555bdfe109e18a85a005bbe340f1951da40 (patch) | |
| tree | eca53eefddae66b310182d9ffa88490b96fb8536 /indra/newview/llprogressview.cpp | |
| parent | 18687a365245122fd74829fc0b735931d2d7d0e0 (diff) | |
| parent | 485711e179e0ccf6351feb02318f41bbb5593662 (diff) | |
merge
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; |