Second Life viewer sources 1.18.5.0-RC

1 files changed, 13 insertions, 5 deletions

diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 5d2a052..8ec5656 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -2495,6 +2495,9 @@ void LLMenuGL::cleanupSpilloverBranch()
                         mItems.erase(found_iter);
                 }
 
+                delete mSpilloverBranch;
+                mSpilloverBranch = NULL;
+
                 // pop off spillover items
                 while (mSpilloverMenu->getItemCount())
                 {
@@ -2607,6 +2610,8 @@ void LLMenuGL::createJumpKeys()
 // remove all items on the menu
 void LLMenuGL::empty( void )
 {
+        cleanupSpilloverBranch();
+
         mItems.clear();
 
         deleteAllChildren();
@@ -4245,11 +4250,14 @@ void LLMenuBarGL::arrange( void )
         for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
         {
                 LLMenuItemGL* item = *item_iter;
-                rect.mLeft = pos;
-                pos += item->getNominalWidth();
-                rect.mRight = pos;
-                item->setRect( rect );
-                item->buildDrawLabel();
+                if (item->getVisible())
+                {
+                        rect.mLeft = pos;
+                        pos += item->getNominalWidth();
+                        rect.mRight = pos;
+                        item->setRect( rect );
+                        item->buildDrawLabel();
+                }
         }
         reshape(rect.mRight, rect.getHeight());
 }