diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:54:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:54:32 -0800 |
| commit | 204ff1edd9139b253e2f2b32fa75c04a737d77bf (patch) | |
| tree | 7d441a50b18872c6a0e32c91f0a1ca147dc32b29 /indra/newview/llpanelvolumepulldown.cpp | |
| parent | 1513643e62a88531888f330e57aa1eb623061729 (diff) | |
| parent | 4dfed6e353ff880fcd45b4c8b402bf0f5a2f19f2 (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); + } } } |