diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-12 11:04:10 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-12 11:04:10 -0800 |
| commit | e47dc498e86034a2c991d0add56d522a39354417 (patch) | |
| tree | dff3acb22d22dd654eefe8c00b116021cba472c3 /indra/newview/llpanelvolumepulldown.cpp | |
| parent | 6e0ebfe18c431465f6d1bc52e079c7a745419de5 (diff) | |
| parent | 31e08f5a53bdee93d976386f8e40b8531f9dc753 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llpanelvolumepulldown.cpp')
| -rw-r--r-- | indra/newview/llpanelvolumepulldown.cpp | 5 |
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); + } } } |