From 7b2a1bd4e9b0d007128e11afe4a8e986942b0cc8 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 4 Aug 2012 00:44:08 +0200 Subject: [PATCH] FIRE-7209/VWR-28494: Pressing the up arrow doesn't skip over separators -> right-click on an inventory item and press the down arrow => skips over all disabled and invisible items and separators -> right-click on an inventory item and press the up arrow => skips over all disabled and invisible items but not separators --- indra/llui/llmenugl.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 701e5d77b7..8bd297aa8a 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -89,7 +89,7 @@ const U32 SEPARATOR_HEIGHT_PIXELS = 8; const S32 TEAROFF_SEPARATOR_HEIGHT_PIXELS = 10; const S32 MENU_ITEM_PADDING = 4; -const std::string SEPARATOR_NAME("separator"); +//const std::string SEPARATOR_NAME("separator"); const std::string VERTICAL_SEPARATOR_LABEL( "|" ); const std::string LLMenuGL::BOOLEAN_TRUE_PREFIX( "\xE2\x9C\x94" ); // U+2714 HEAVY CHECK MARK @@ -2762,7 +2762,10 @@ LLMenuItemGL* LLMenuGL::highlightPrevItem(LLMenuItemGL* cur_item, BOOL skip_disa while(1) { // skip separators and disabled/invisible items - if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getVisible() && (*prev_item_iter)->getName() != SEPARATOR_NAME) +// if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getVisible() && (*prev_item_iter)->getName() != SEPARATOR_NAME) +// [SL:KB] - Patch: UI-Misc | Checked: 2012-08-03 (Catznip-3.3) + if ((*prev_item_iter)->getEnabled() && (*prev_item_iter)->getVisible() && !dynamic_cast(*prev_item_iter)) +// [/SL:KB] { (*prev_item_iter)->setHighlight(TRUE); return (*prev_item_iter);