Second Life viewer sources 1.23.1-RC

1 files changed, 19 insertions, 4 deletions

diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index f2f2aae..253b30b 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -2178,7 +2178,9 @@ void LLMenuGL::arrange( void )
                         {
                                 if ((*item_iter)->getVisible())
                                 {
-                                        if (!getTornOff() && width + (*item_iter)->getNominalWidth() > max_width - spillover_item_width)
+                                        if (!getTornOff() 
+                                                && item_iter != mItems.begin() // Don't spillover the first item!
+                                                && width + (*item_iter)->getNominalWidth() > max_width - spillover_item_width)
                                         {
                                                 // no room for any more items
                                                 createSpilloverBranch();
@@ -2188,8 +2190,9 @@ void LLMenuGL::arrange( void )
                                                 {
                                                         LLMenuItemGL* itemp = (*spillover_iter);
                                                         removeChild(itemp);
-                                                        mSpilloverMenu->append(itemp);
+                                                        mSpilloverMenu->appendNoArrange(itemp); // *NOTE:Mani Favor addChild() in merge with skinning
                                                 }
+                                                mSpilloverMenu->arrange(); // *NOTE: Mani Remove line in merge with skinning/viewer2.0 branch
                                                 mItems.erase(item_iter, mItems.end());
                                                 
                                                 mItems.push_back(mSpilloverBranch);
@@ -2215,7 +2218,9 @@ void LLMenuGL::arrange( void )
                         {
                                 if ((*item_iter)->getVisible())
                                 {
-                                        if (!getTornOff() && height + (*item_iter)->getNominalHeight() > max_height - spillover_item_height)
+                                        if (!getTornOff() 
+                                                && item_iter != mItems.begin() // Don't spillover the first item!
+                                                && height + (*item_iter)->getNominalHeight() > max_height - spillover_item_height)
                                         {
                                                 // no room for any more items
                                                 createSpilloverBranch();
@@ -2225,8 +2230,9 @@ void LLMenuGL::arrange( void )
                                                 {
                                                         LLMenuItemGL* itemp = (*spillover_iter);
                                                         removeChild(itemp);
-                                                        mSpilloverMenu->append(itemp);
+                                                        mSpilloverMenu->appendNoArrange(itemp);  // *NOTE:Mani Favor addChild() in merge with skinning
                                                 }
+                                                mSpilloverMenu->arrange(); // *NOTE: Mani Remove line in merge with skinning/viewer2.0 branch
                                                 mItems.erase(item_iter, mItems.end());
                                                 mItems.push_back(mSpilloverBranch);
                                                 addChild(mSpilloverBranch);
@@ -2477,6 +2483,15 @@ BOOL LLMenuGL::append( LLMenuItemGL* item )
         return TRUE;
 }
 
+// *NOTE:Mani - appendNoArrange() should be removed when merging to skinning/viewer2.0
+// Its added as a fix to a viewer 1.23 bug that has already been address by skinning work.
+BOOL LLMenuGL::appendNoArrange( LLMenuItemGL* item )
+{
+        mItems.push_back( item );
+        addChild( item );
+        return TRUE;
+}
+
 // add a separator to this menu
 BOOL LLMenuGL::appendSeparator( const std::string &separator_name )
 {