summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprimmediacontrols.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-24 16:51:04 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-24 16:51:04 -0800
commitce7102d300d71b764a06cc80286d8e95ef0130ee (patch)
treeb2963103863f0dbeef43d45f53758e6961dc178e /indra/newview/llpanelprimmediacontrols.cpp
parenta49862a4fcb2d00d1778092191321e033a693076 (diff)
FIX DEV-43033 - the prim media controls were "stealing focus" and so would clobber any drop-downs
Reviewed by James (thanks, James!)
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);