svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.

1 files changed, 13 insertions, 5 deletions

diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 9b4a2a168c..906b134d2b 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -2489,6 +2489,9 @@ void LLMenuGL::cleanupSpilloverBranch()
 			mItems.erase(found_iter);
 		}
 
+		delete mSpilloverBranch;
+		mSpilloverBranch = NULL;
+
 		// pop off spillover items
 		while (mSpilloverMenu->getItemCount())
 		{
@@ -2601,6 +2604,8 @@ void LLMenuGL::createJumpKeys()
 // remove all items on the menu
 void LLMenuGL::empty( void )
 {
+	cleanupSpilloverBranch();
+
 	mItems.clear();
 
 	deleteAllChildren();
@@ -4239,11 +4244,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());
 }