diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-17 09:54:54 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-17 09:54:54 +0300 |
| commit | a3d2d2be2a8e6fed0cafb45dad22f58b4d6f0e76 (patch) | |
| tree | a8ef67b76f3bbd068ba25de488b50198749c8b71 /indra | |
| parent | f9dff766a8fbd6e8ee8db486c1d76ededdac7ed4 (diff) | |
| parent | 8bd31fa35190bdd99a4167a2bfdd7d3d1a6e5d3f (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 70c144a832..b77126996e 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3732,10 +3732,14 @@ void LLContextMenuBranch::buildDrawLabel( void ) void LLContextMenuBranch::showSubMenu() { - S32 center_x; - S32 center_y; - localPointToScreen(getRect().getWidth(), getRect().getHeight() , ¢er_x, ¢er_y); - mBranch->show( center_x, center_y); + LLMenuItemGL* menu_item = mBranch->getParentMenuItem(); + if (menu_item != NULL && menu_item->getVisible()) + { + S32 center_x; + S32 center_y; + localPointToScreen(getRect().getWidth(), getRect().getHeight() , ¢er_x, ¢er_y); + mBranch->show(center_x, center_y); + } } // onCommit() - do the primary funcationality of the menu item. |