summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprimmediacontrols.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-25 17:09:53 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-25 17:09:53 +0000
commit5467853d8dee218a60268d056995bf4819684cfd (patch)
treec7a6ee02b8b66695cc1bca619b6c756ebbaeffd6 /indra/newview/llpanelprimmediacontrols.cpp
parente71fdf32da50e3f5cb481c040add27a8a4f3777e (diff)
parent6631e4d872fd4bd0208e44320e0b189b624cda86 (diff)
merge
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
-rw-r--r--indra/newview/llpanelprimmediacontrols.cpp2
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);