svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

3 files changed, 8 insertions, 7 deletions

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index d682c7a36a..c9ebd64c28 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -288,8 +288,8 @@ public:
 	void			getMinimizePosition( S32 *left, S32 *bottom);
 	void			restoreAll();		// un-minimize all floaters
 	typedef std::set<LLView*> skip_list_t;
-	void LLFloaterView::pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t());
-	void LLFloaterView::popVisibleAll(const skip_list_t& skip_list = skip_list_t());
+	void pushVisibleAll(BOOL visible, const skip_list_t& skip_list = skip_list_t());
+	void popVisibleAll(const skip_list_t& skip_list = skip_list_t());
 
 	void			setCycleMode(BOOL mode);
 	BOOL			getCycleMode();
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 650596c7f7..8607d1d752 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -528,8 +528,8 @@ void LLMenuItemGL::draw( void )
 		}
 	}
 
-	// underline "jump" key
-	if (getMenu()->jumpKeysActive())
+	// underline "jump" key only when keyboard navigation has been initiated
+	if (getMenu()->jumpKeysActive() && LLMenuGL::getKeyboardMode())
 	{
 		LLString upper_case_label = mLabel.getString();
 		LLString::toUpper(upper_case_label);
@@ -1792,8 +1792,8 @@ void LLMenuItemBranchDownGL::draw( void )
 				   LLFontGL::HCENTER, LLFontGL::BOTTOM, font_style );
 
 
-	// underline navigation key
-	if (getMenu()->jumpKeysActive())
+	// underline navigation key only when keyboard navigation has been initiated
+	if (getMenu()->jumpKeysActive() && LLMenuGL::getKeyboardMode())
 	{
 		LLString upper_case_label = mLabel.getString();
 		LLString::toUpper(upper_case_label);
@@ -4281,6 +4281,7 @@ BOOL LLMenuBarGL::handleHover( S32 x, S32 y, MASK mask )
 					((LLMenuItemGL*)viewp)->doIt();
 					LLMenuGL::setKeyboardMode(FALSE);
 				}
+				LLMenuGL::setKeyboardMode(FALSE);
 			}
 		}
 
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 0dca8f2550..c15f417e65 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -410,7 +410,7 @@ public:
 	virtual void drawBackground(LLMenuItemGL* itemp, LLColor4& color);
 	virtual void setVisible(BOOL visible);
 
-	virtual BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask);
+	virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
 
 	LLMenuGL* getChildMenuByName(const LLString& name, BOOL recurse) const;