diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
| commit | 57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch) | |
| tree | ea54edd04380696ef3f83671204fdae2f7ae298e /indra/newview/llprogressview.cpp | |
| parent | c4c537e957458650a2948ffbd3a787f007d87f7a (diff) | |
| parent | eca30a22626b9a3e68e0e55f8da75614cd60d713 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index aa603c417f..3c6645f116 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -182,7 +182,8 @@ void LLProgressView::draw() LLPanel::draw(); if (mFadeTimer.getElapsedTimeF32() > FADE_IN_TIME) { - gFocusMgr.removeTopCtrlWithoutCallback(this); + // Fade is complete, release focus + gFocusMgr.releaseFocusIfNeeded( this ); LLPanel::setVisible(FALSE); gStartTexture = NULL; } |