livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/ 

--HG--
branch : product-engine
master
Alexei Arabadji 2010-05-17 09:54:54 +03:00
parent f9dff766a8 8bd31fa351
commit a3d2d2be2a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llui/llmenugl.cpp
View File

@ -3732,10 +3732,14 @@ void LLContextMenuBranch::buildDrawLabel( void )
void LLContextMenuBranch::showSubMenu()
{
S32 center_x;
S32 center_y;
localPointToScreen(getRect().getWidth(), getRect().getHeight() , &center_x, &center_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() , &center_x, &center_y);
mBranch->show(center_x, center_y);
}
}
// onCommit() - do the primary funcationality of the menu item.