MAINT-302 FIXED Login screen menus flicker when mouse hovers over them

2 files changed, 16 insertions, 8 deletions

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index fbf2bb5f98..3b8d282445 100755
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -225,7 +225,6 @@ BOOL LLMenuItemGL::handleAcceleratorKey(KEY key, MASK mask)
 
 BOOL LLMenuItemGL::handleHover(S32 x, S32 y, MASK mask)
 {
-	setHover(TRUE);
 	getWindow()->setCursor(UI_CURSOR_ARROW);
 	return TRUE;
 }
@@ -236,6 +235,18 @@ BOOL LLMenuItemGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	return LLUICtrl::handleRightMouseDown(x,y,mask);
 }
 
+void LLMenuItemGL::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+	setHover(TRUE);
+	LLUICtrl::onMouseEnter(x,y,mask);
+}
+
+void LLMenuItemGL::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	setHover(FALSE);
+	LLUICtrl::onMouseLeave(x,y,mask);
+}
+
 //virtual
 BOOL LLMenuItemGL::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
@@ -533,9 +544,6 @@ void LLMenuItemGL::draw( void )
 			gl_line_2d(x_begin, (MENU_ITEM_PADDING / 2) + 1, x_end, (MENU_ITEM_PADDING / 2) + 1);
 		}
 	}
-
-	// clear got hover every frame
-	setHover(FALSE);
 }
 
 BOOL LLMenuItemGL::setLabelArg( const std::string& key, const LLStringExplicit& text )
@@ -1597,10 +1605,6 @@ void LLMenuItemBranchDownGL::draw( void )
 			gl_line_2d(x_begin, LABEL_BOTTOM_PAD_PIXELS, x_end, LABEL_BOTTOM_PAD_PIXELS);
 		}
 	}
-
-	// reset every frame so that we only show highlight 
-	// when we get hover events on that frame
-	setHover(FALSE);
 }
 
 
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index ae9b169691..28f9e3b6e9 100755
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -158,6 +158,10 @@ public:
 	virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
 	virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
 	virtual BOOL handleScrollWheel( S32 x, S32 y, S32 clicks );
+
+	virtual void	onMouseEnter(S32 x, S32 y, MASK mask);
+	virtual void	onMouseLeave(S32 x, S32 y, MASK mask);
+
 	virtual void draw( void );
 
 	BOOL getHover() const { return mGotHover; }