diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2009-12-01 11:26:43 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2009-12-01 11:26:43 -0800 |
commit | dee48496166e44f0e9b13a6c0b348d3409ddf0e5 (patch) | |
tree | 270bb0fd1935a469acfa2c0dcefec7e84659bad4 /indra/llui | |
parent | 053c93f9f482d16bddf001efddaee0a0b52c95dc (diff) |
EXT-2635 No message reminding user that a restart is required to reset cache (was Clear Cache)
EXT-2652 Favorites bar drop-down button (for when favorites exceed width of viewer) is not configurable via XUI
EXT-2227 [BSI] Preferences -> Setup -> Cache Location blank
EXT-1036 Clicking menu separators selects wrong menu option (allows selection of greyed-out option)
reviewed by James
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/llmenugl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index f8935d03ac..907f2352a0 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -590,12 +590,13 @@ BOOL LLMenuItemSeparatorGL::handleMouseDown(S32 x, S32 y, MASK mask) LLMenuGL* parent_menu = getMenu(); if (y > getRect().getHeight() / 2) { - LLView* prev_menu_item = parent_menu->findPrevSibling(this); + // the menu items are in the child list in bottom up order + LLView* prev_menu_item = parent_menu->findNextSibling(this); return prev_menu_item ? prev_menu_item->handleMouseDown(x, prev_menu_item->getRect().getHeight(), mask) : FALSE; } else { - LLView* next_menu_item = parent_menu->findNextSibling(this); + LLView* next_menu_item = parent_menu->findPrevSibling(this); return next_menu_item ? next_menu_item->handleMouseDown(x, 0, mask) : FALSE; } } @@ -605,12 +606,12 @@ BOOL LLMenuItemSeparatorGL::handleMouseUp(S32 x, S32 y, MASK mask) LLMenuGL* parent_menu = getMenu(); if (y > getRect().getHeight() / 2) { - LLView* prev_menu_item = parent_menu->findPrevSibling(this); + LLView* prev_menu_item = parent_menu->findNextSibling(this); return prev_menu_item ? prev_menu_item->handleMouseUp(x, prev_menu_item->getRect().getHeight(), mask) : FALSE; } else { - LLView* next_menu_item = parent_menu->findNextSibling(this); + LLView* next_menu_item = parent_menu->findPrevSibling(this); return next_menu_item ? next_menu_item->handleMouseUp(x, 0, mask) : FALSE; } } |