Fix release merge issues (included upstream changes not yet in release from bear)

1 files changed, 3 insertions, 34 deletions

diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index ff85b0ad09..8c2be44904 100755
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -34,7 +34,7 @@
 #include "llui.h"
 #include "llwindow.h"
 #include "llkeyboard.h"
-#include "llmenugl.h"
+
 // static
 std::list<LLModalDialog*> LLModalDialog::sModalStack;
 
@@ -161,18 +161,6 @@ void LLModalDialog::setVisible( BOOL visible )
 
 BOOL LLModalDialog::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	LLView* popup_menu = LLMenuGL::sMenuContainer->getVisibleMenu();
-	if (popup_menu != NULL)
-	{
-		S32 mx, my;
-		LLUI::getMousePositionScreen(&mx, &my);
-		LLRect menu_screen_rc = popup_menu->calcScreenRect();
-		if(!menu_screen_rc.pointInRect(mx, my))
-		{
-			LLMenuGL::sMenuContainer->hideMenus();
-		}
-	}
-
 	if (mModal)
 	{
 		if (!LLFloater::handleMouseDown(x, y, mask))
@@ -185,34 +173,16 @@ BOOL LLModalDialog::handleMouseDown(S32 x, S32 y, MASK mask)
 	{
 		LLFloater::handleMouseDown(x, y, mask);
 	}
-
-
 	return TRUE;
 }
 
 BOOL LLModalDialog::handleHover(S32 x, S32 y, MASK mask)		
-{
+{ 
 	if( childrenHandleHover(x, y, mask) == NULL )
 	{
 		getWindow()->setCursor(UI_CURSOR_ARROW);
-		lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
+		lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;		
 	}
-
-	LLView* popup_menu = LLMenuGL::sMenuContainer->getVisibleMenu();
-	if (popup_menu != NULL)
-	{
-		S32 mx, my;
-		LLUI::getMousePositionScreen(&mx, &my);
-		LLRect menu_screen_rc = popup_menu->calcScreenRect();
-		if(menu_screen_rc.pointInRect(mx, my))
-		{
-			S32 local_x = mx - popup_menu->getRect().mLeft;
-			S32 local_y = my - popup_menu->getRect().mBottom;
-			popup_menu->handleHover(local_x, local_y, mask);
-			gFocusMgr.setMouseCapture(NULL);
-		}
-	}
-
 	return TRUE;
 }
 
@@ -240,7 +210,6 @@ BOOL LLModalDialog::handleDoubleClick(S32 x, S32 y, MASK mask)
 
 BOOL LLModalDialog::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	LLMenuGL::sMenuContainer->hideMenus();
 	childrenHandleRightMouseDown(x, y, mask);
 	return TRUE;
 }