From b2627d927f1642bea84b92adfccd9403676e1341 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 24 May 2009 02:59:24 -0500
Subject: Second Life viewer sources 1.23.2-RC

---
 linden/indra/llui/llmenugl.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'linden/indra/llui')

diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 253b30b..e04e970 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -2193,13 +2193,12 @@ void LLMenuGL::arrange( void )
 							mSpilloverMenu->appendNoArrange(itemp); // *NOTE:Mani Favor addChild() in merge with skinning
 						}
 						mSpilloverMenu->arrange(); // *NOTE: Mani Remove line in merge with skinning/viewer2.0 branch
+						mSpilloverMenu->updateParent(LLMenuGL::sMenuContainer); // *NOTE: Mani Remove line in merge with skinning/viewer2.0 branch
 						mItems.erase(item_iter, mItems.end());
-						
 						mItems.push_back(mSpilloverBranch);
 						addChild(mSpilloverBranch);
 						height = llmax(height, mSpilloverBranch->getNominalHeight());
 						width += mSpilloverBranch->getNominalWidth();
-
 						break;
 					}
 					else
@@ -2233,12 +2232,12 @@ void LLMenuGL::arrange( void )
 							mSpilloverMenu->appendNoArrange(itemp);  // *NOTE:Mani Favor addChild() in merge with skinning
 						}
 						mSpilloverMenu->arrange(); // *NOTE: Mani Remove line in merge with skinning/viewer2.0 branch
+						mSpilloverMenu->updateParent(LLMenuGL::sMenuContainer); // *NOTE: Mani Remove line in merge with skinning/viewer2.0 branch
 						mItems.erase(item_iter, mItems.end());
 						mItems.push_back(mSpilloverBranch);
 						addChild(mSpilloverBranch);
 						height += mSpilloverBranch->getNominalHeight();
 						width = llmax( width, mSpilloverBranch->getNominalWidth() );
-
 						break;
 					}
 					else
-- 
cgit v1.1