diff options
| author | Richard Linden <none@none> | 2010-03-05 15:41:37 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-05 15:41:37 -0800 |
| commit | a3fa96ff0eeb3691f38e82ad4a245db8049dfddd (patch) | |
| tree | d02718296dfec15284ee94cd647b89084502f213 /indra/newview/llprogressview.cpp | |
| parent | f0ea8083ebf207d00c043dd35eddf5ab55e71c0d (diff) | |
| parent | 27919e106a383ea873b9bf73d2974b40cbe2e603 (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; |