From cde9e6324ddc74508177fef20e9d3b05094a5f2c Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 16 Sep 2012 02:46:25 +0200 Subject: [PATCH] FIRE-7209/VWR-28494: Prevent infinite recursion in LLMenuItemSeparatorGL::handleMouseUp() --- indra/llui/llmenugl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 4e761cbe21..f88041df51 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -591,7 +591,7 @@ BOOL LLMenuItemSeparatorGL::handleMouseDown(S32 x, S32 y, MASK mask) LLMenuGL* parent_menu = getMenu(); // [SL:KB] - Patch: UI-Misc | Checked: 2012-08-03 (Catznip-3.3) LLMenuItemGL* menu_item = (parent_menu) ? parent_menu->getHighlightedItem() : NULL; - if (menu_item) + if ( (menu_item) && (this != menu_item) ) { return menu_item->handleMouseDown(x, y, mask); } @@ -615,11 +615,11 @@ BOOL LLMenuItemSeparatorGL::handleMouseUp(S32 x, S32 y, MASK mask) LLMenuGL* parent_menu = getMenu(); // [SL:KB] - Patch: UI-Misc | Checked: 2012-08-03 (Catznip-3.3) LLMenuItemGL* menu_item = (parent_menu) ? parent_menu->getHighlightedItem() : NULL; - if (menu_item) + if ( (menu_item) && (this != menu_item) ) { return menu_item->handleMouseUp(x, y, mask); } - return LLMenuItemGL::handleMouseDown(x, y, mask); + return LLMenuItemGL::handleMouseUp(x, y, mask); // [/SL:KB] // if (y > getRect().getHeight() / 2) // {