summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelvolumepulldown.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2010-02-11 18:06:25 -0800
committerrichard <none@none>2010-02-11 18:06:25 -0800
commit6c5b984bf670e34fd88a8f1a0bdeb1042fa531b2 (patch)
tree32865ad0feb6311d06b3c12a738fb60bcf8c1ac5 /indra/newview/llpanelvolumepulldown.cpp
parent62e1508bf603a58afdd5e2cc8ca40927a791ba47 (diff)
converted llfloaternearbymedia to llpanelnearbymedia
moved from LLTransientDockableFloater model to popup panel model like volume popup
Diffstat (limited to 'indra/newview/llpanelvolumepulldown.cpp')
-rw-r--r--indra/newview/llpanelvolumepulldown.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
index 74e37efe4e..247134ad63 100644
--- a/indra/newview/llpanelvolumepulldown.cpp
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -96,7 +96,10 @@ void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility )
else
{
mHoverTimer.stop();
- gFocusMgr.setTopCtrl(NULL);
+ if (gFocusMgr.getTopCtrl() == this)
+ {
+ gFocusMgr.setTopCtrl(NULL);
+ }
}
}