diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 16:52:08 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-24 16:52:08 -0800 |
| commit | 859607a4238502a9bc4f650ebdf73cb233f9bb4c (patch) | |
| tree | 268e0b82286f86e5673128f856bad122a8263144 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | fd74ba5467967cbdb5f7aca8b476080c66df2cd2 (diff) | |
| parent | ce7102d300d71b764a06cc80286d8e95ef0130ee (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 529912929d..71c1b0cbb9 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -510,7 +510,7 @@ void LLPanelPrimMediaControls::updateShape() mMediaProgressBar->setPercent(media_plugin->getProgressPercent()); gFocusMgr.setTopCtrl(mMediaProgressPanel); } - else + else if (mMediaProgressPanel->getVisible()) { mMediaProgressPanel->setVisible(false); gFocusMgr.setTopCtrl(NULL); |