From ccb1d2b1e43369803cf9ab1ffc7deefbac2db8fc Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 10 Sep 2009 03:12:12 +0000
Subject: 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

---
 indra/newview/llbottomtray.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llbottomtray.cpp')

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;
-- 
cgit v1.2.3