diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 14:39:05 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-25 14:39:05 -0800 |
commit | 3efbd20980175f6dae2cecbfbbd23bb326948189 (patch) | |
tree | 62868a14cc796316fa8f060199841d7cb835c109 /indra/newview | |
parent | 751a9049822ab39f1762ab6758cc3ee0aabb4a4b (diff) |
Implement fade-out for llprogressbar, fix problem where setTopCtrl was being called
Review #47
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index ceb37ae790..c3aa602ee6 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -503,12 +503,10 @@ void LLPanelPrimMediaControls::updateShape() { mMediaProgressPanel->setVisible(true); mMediaProgressBar->setPercent(media_plugin->getProgressPercent()); - gFocusMgr.setTopCtrl(mMediaProgressPanel); } - else if (mMediaProgressPanel->getVisible()) + else { mMediaProgressPanel->setVisible(false); - gFocusMgr.setTopCtrl(NULL); } } |