diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:12:12 +0000 |
| commit | ccb1d2b1e43369803cf9ab1ffc7deefbac2db8fc (patch) | |
| tree | 57b085da51db0f63ab249926102f8ebbca8da1ee /indra/newview/llbottomtray.cpp | |
| parent | 44f294d484185ef3cb9f51e5cba6a3ee269b96dc (diff) | |
merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-825 EXT-893 EXT-889 EXT-88
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index d166715038..06f9a86d8d 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -224,11 +224,14 @@ void LLBottomTray::setVisible(BOOL visible) BOOL LLBottomTray::handleRightMouseDown(S32 x, S32 y, MASK mask) { - if (mShowCamMoveCtrlsContextMenu) + if (!LLPanel::handleRightMouseDown(x, y, mask)) { - mShowCamMoveCtrlsContextMenu->buildDrawLabels(); - mShowCamMoveCtrlsContextMenu->updateParent(LLMenuGL::sMenuContainer); - LLMenuGL::showPopup(this, mShowCamMoveCtrlsContextMenu, x, y); + if (mShowCamMoveCtrlsContextMenu) + { + mShowCamMoveCtrlsContextMenu->buildDrawLabels(); + mShowCamMoveCtrlsContextMenu->updateParent(LLMenuGL::sMenuContainer); + LLMenuGL::showPopup(this, mShowCamMoveCtrlsContextMenu, x, y); + } } return TRUE; |