18 files changed, 73 insertions, 59 deletions

diff --git a/linden/indra/llui/llcheckboxctrl.h b/linden/indra/llui/llcheckboxctrl.h
index 1f92708..6df0e77 100644
--- a/linden/indra/llui/llcheckboxctrl.h
+++ b/linden/indra/llui/llcheckboxctrl.h
@@ -83,7 +83,7 @@ public:
         virtual void            setEnabled( BOOL b );
 
         virtual void            draw();
-        virtual void            reshape(S32 width, S32 height, BOOL called_from_parent);
+        virtual void            reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
         // LLUICtrl interface
         virtual void            setValue(const LLSD& value );
diff --git a/linden/indra/llui/lldraghandle.h b/linden/indra/llui/lldraghandle.h
index cb9924d..88e16dc 100644
--- a/linden/indra/llui/lldraghandle.h
+++ b/linden/indra/llui/lldraghandle.h
@@ -57,7 +57,6 @@ public:
 
         virtual void    setTitle( const LLString& title ) = 0;
         virtual const LLString& getTitle() const = 0;
-        virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) = 0;
 
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 493e68f..1e825d3 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -154,7 +154,7 @@ LLFloater::LLFloater(const LLString& name)
                 mButtons[i] = NULL;
         }
         LLString title; // null string
-        init(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults
+        initFloater(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults
 }
 
 
@@ -173,7 +173,7 @@ LLFloater::LLFloater(const LLString& name, const LLRect& rect, const LLString& t
                 mButtonsEnabled[i] = FALSE;
                 mButtons[i] = NULL;
         }
-        init( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
+        initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
 }
 
 LLFloater::LLFloater(const LLString& name, const LLString& rect_control, const LLString& title, 
@@ -191,12 +191,12 @@ LLFloater::LLFloater(const LLString& name, const LLString& rect_control, const L
                 mButtonsEnabled[i] = FALSE;
                 mButtons[i] = NULL;
         }
-        init( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
+        initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
 }
 
 
 // Note: Floaters constructed from XML call init() twice!
-void LLFloater::init(const LLString& title,
+void LLFloater::initFloater(const LLString& title,
                                          BOOL resizable, S32 min_width, S32 min_height,
                                          BOOL drag_on_left, BOOL minimizable, BOOL close_btn)
 {
@@ -576,6 +576,11 @@ void LLFloater::close(bool app_quitting)
         }
 }
 
+/*virtual*/
+void LLFloater::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+        LLPanel::reshape(width, height, called_from_parent);
+}
 
 void LLFloater::releaseFocus()
 {
@@ -777,8 +782,6 @@ void LLFloater::setMinimized(BOOL minimize)
         {
                 mExpandedRect = getRect();
 
-                reshape( MINIMIZED_WIDTH, LLFLOATER_HEADER_SIZE, TRUE);
-
                 // If the floater has been dragged while minimized in the
                 // past, then locate it at its previous minimized location.
                 // Otherwise, ask the view for a minimize position.
@@ -841,6 +844,9 @@ void LLFloater::setMinimized(BOOL minimize)
                 releaseFocus();
 
                 mMinimized = TRUE;
+
+                // Reshape *after* setting mMinimized
+                reshape( MINIMIZED_WIDTH, LLFLOATER_HEADER_SIZE, TRUE);
         }
         else
         {
@@ -853,7 +859,6 @@ void LLFloater::setMinimized(BOOL minimize)
                         mPreviousMinimizedBottom = currentRect.mBottom;
                 }
 
-                reshape( mExpandedRect.getWidth(), mExpandedRect.getHeight(), TRUE );
                 setOrigin( mExpandedRect.mLeft, mExpandedRect.mBottom );
 
                 if (mButtonsEnabled[BUTTON_RESTORE])
@@ -894,6 +899,9 @@ void LLFloater::setMinimized(BOOL minimize)
                 }
 
                 mMinimized = FALSE;
+
+                // Reshape *after* setting mMinimized
+                reshape( mExpandedRect.getWidth(), mExpandedRect.getHeight(), TRUE );
         }
         make_ui_sound("UISndWindowClose");
         updateButtons();
@@ -1633,11 +1641,11 @@ LLFloaterView::LLFloaterView( const LLString& name, const LLRect& rect )
 // By default, adjust vertical.
 void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-        reshape(width, height, called_from_parent, ADJUST_VERTICAL_YES);
+        reshapeFloater(width, height, called_from_parent, ADJUST_VERTICAL_YES);
 }
 
 // When reshaping this view, make the floaters follow their closest edge.
-void LLFloaterView::reshape(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical)
+void LLFloaterView::reshapeFloater(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical)
 {
         S32 old_width = getRect().getWidth();
         S32 old_height = getRect().getHeight();
@@ -2894,7 +2902,7 @@ void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
         setRect(rect);
         setName(name);
         
-        init(title,
+        initFloater(title,
                         resizable,
                         min_width,
                         min_height,
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 534af16..f0bbcaf 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -119,7 +119,7 @@ public:
 
         // Can be called multiple times to reset floater parameters.
         // Deletes all children of the floater.
-        virtual void            init(const LLString& title, BOOL resizable, 
+        virtual void            initFloater(const LLString& title, BOOL resizable, 
                                                 S32 min_width, S32 min_height, BOOL drag_on_left,
                                                 BOOL minimizable, BOOL close_btn);
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLOATER; }
@@ -130,6 +130,8 @@ public:
         // If allowed, close the floater cleanly, releasing focus.
         // app_quitting is passed to onClose() below.
         virtual void    close(bool app_quitting = false);
+
+        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         
         // Release keyboard and mouse focus
         void                    releaseFocus();
@@ -303,8 +305,8 @@ public:
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLOATER_VIEW; }
         virtual LLString getWidgetTag() const { return LL_FLOATER_VIEW_TAG; }
 
-        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
-        void reshape(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical);
+        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+        void reshapeFloater(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical);
 
         /*virtual*/ void draw();
         /*virtual*/ LLRect getSnapRect() const;
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 4a12870..cb54476 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -3068,8 +3068,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
 class LLPieMenuBranch : public LLMenuItemGL
 {
 public:
-        LLPieMenuBranch(const LLString& name, const LLString& label, LLPieMenu* branch,
-                                        enabled_callback ecb, void* user_data);
+        LLPieMenuBranch(const LLString& name, const LLString& label, LLPieMenu* branch);
 
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_PIE_MENU_BRANCH; }
         virtual LLString getWidgetTag() const { return LL_PIE_MENU_BRANCH_TAG; }
@@ -3084,19 +3083,13 @@ public:
 
 protected:
         LLPieMenu* mBranch;
-        enabled_callback mEnabledCallback;
-        void* mUserData;
 };
 
 LLPieMenuBranch::LLPieMenuBranch(const LLString& name,
                                                                  const LLString& label,
-                                                                 LLPieMenu* branch,
-                                                                 enabled_callback ecb,
-                                                                 void* user_data) 
+                                                                 LLPieMenu* branch) 
 :       LLMenuItemGL( name, label, KEY_NONE, MASK_NONE ),
-        mBranch( branch ),
-        mEnabledCallback( ecb ),
-        mUserData(user_data)
+        mBranch( branch )
 {
         mBranch->hide(FALSE);
         mBranch->setParentMenuItem(this);
@@ -3105,12 +3098,6 @@ LLPieMenuBranch::LLPieMenuBranch(const LLString& name,
 // called to rebuild the draw label
 void LLPieMenuBranch::buildDrawLabel( void )
 {
-        if(mEnabledCallback)
-        {
-                setEnabled(mEnabledCallback(mUserData));
-                setDrawTextDisabled(FALSE);
-        }
-        else
         {
                 // default enablement is this -- if any of the subitems are
                 // enabled, this item is enabled. JC
@@ -3203,7 +3190,7 @@ void LLPieMenu::initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *fac
                         child->getAttributeString("label", label);
 
                         LLPieMenu *submenu = new LLPieMenu(name, label);
-                        appendMenu(submenu);
+                        appendPieMenu(submenu);
                         submenu->initXML(child, context, factory);
                 }
                 else
@@ -3585,17 +3572,14 @@ BOOL LLPieMenu::appendSeparator(const LLString &separator_name)
 }
 
 
-// virtual
-BOOL LLPieMenu::appendMenu(LLPieMenu *menu,
-                                                   enabled_callback enabled_cb,
-                                                   void* user_data)
+BOOL LLPieMenu::appendPieMenu(LLPieMenu *menu)
 {
         if (menu == this)
         {
                 llerrs << "Can't attach a pie menu to itself" << llendl;
         }
         LLPieMenuBranch *item;
-        item = new LLPieMenuBranch(menu->getName(), menu->getLabel(), menu, enabled_cb, user_data);
+        item = new LLPieMenuBranch(menu->getName(), menu->getLabel(), menu);
         getParent()->addChild(item->getBranch());
         item->setFont( LLFontGL::sSansSerifSmall );
         return append( item );
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 4e5ac69..cd39006 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -524,8 +524,6 @@ public:
         static void setKeyboardMode(BOOL mode) { sKeyboardMode = mode; }
         static BOOL getKeyboardMode() { return sKeyboardMode; }
 
-        static void onFocusLost(LLView* old_focus);
-
         static class LLMenuHolderGL* sMenuContainer;
         
 protected:
@@ -666,18 +664,15 @@ public:
         virtual BOOL append(LLMenuItemGL* item);
         virtual BOOL appendSeparator( const LLString &separator_name = "separator" );
 
-        // the enabled callback is meant for the submenu. The api works
-        // this way because the menu branch item responsible for the pie
-        // submenu is constructed here.
-        virtual BOOL appendMenu(LLPieMenu *menu,
-                                                        enabled_callback enabled_cb = NULL,
-                                                        void* user_data = NULL );
+        BOOL appendPieMenu(LLPieMenu *menu);
+
         virtual void arrange( void );
 
         // Display the menu centered on this point on the screen.
         void show(S32 x, S32 y, BOOL mouse_down);
         void hide(BOOL item_selected);
 
+        
 private:
         LLMenuItemGL *pieItemFromXY(S32 x, S32 y);
         S32                       pieItemIndexFromXY(S32 x, S32 y);
@@ -763,7 +758,7 @@ public:
         virtual LLString getWidgetTag() const { return LL_MENU_HOLDER_GL_TAG; }
 
         virtual BOOL hideMenus();
-        void reshape(S32 width, S32 height, BOOL called_from_parent);
+        void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         void setCanHide(BOOL can_hide) { mCanHide = can_hide; }
 
         // LLView functionality
diff --git a/linden/indra/llui/llmodaldialog.h b/linden/indra/llui/llmodaldialog.h
index dd82b25..0199498 100644
--- a/linden/indra/llui/llmodaldialog.h
+++ b/linden/indra/llui/llmodaldialog.h
@@ -49,7 +49,7 @@ public:
 
         /*virtual*/ void        open(); /* Flawfinder: ignore */
         
-        /*virtual*/ void        reshape(S32 width, S32 height, BOOL called_from_parent = 1);
+        /*virtual*/ void        reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         
         /*virtual*/ void        startModal();
         /*virtual*/ void        stopModal();
diff --git a/linden/indra/llui/llmultisliderctrl.cpp b/linden/indra/llui/llmultisliderctrl.cpp
index 0d23dd7..47e21d8 100644
--- a/linden/indra/llui/llmultisliderctrl.cpp
+++ b/linden/indra/llui/llmultisliderctrl.cpp
@@ -183,7 +183,7 @@ void LLMultiSliderCtrl::setCurSlider(const LLString& name)
         mCurValue = mMultiSlider->getCurSliderValue();
 }
 
-BOOL LLMultiSliderCtrl::setLabelArg( const LLString& key, const LLString& text )
+BOOL LLMultiSliderCtrl::setLabelArg( const LLString& key, const LLStringExplicit& text )
 {
         BOOL res = FALSE;
         if (mLabelBox)
diff --git a/linden/indra/llui/llmultisliderctrl.h b/linden/indra/llui/llmultisliderctrl.h
index 90f43df..5e2d13c 100644
--- a/linden/indra/llui/llmultisliderctrl.h
+++ b/linden/indra/llui/llmultisliderctrl.h
@@ -81,7 +81,7 @@ public:
 
         virtual void    setValue(const LLSD& value );
         virtual LLSD    getValue() const                { return mMultiSlider->getValue(); }
-        virtual BOOL    setLabelArg( const LLString& key, const LLString& text );
+        virtual BOOL    setLabelArg( const LLString& key, const LLStringExplicit& text );
 
         const LLString& getCurSlider() const                                    { return mMultiSlider->getCurSlider(); }
         F32                             getCurSliderValue() const                               { return mCurValue; }
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 9a3f1a2..567d29e 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -715,7 +715,17 @@ LLString LLPanel::getString(const LLString& name, const LLString::format_map_t&
                 formatted_string.setArgList(args);
                 return formatted_string.getString();
         }
-        llerrs << "Failed to find string " << name << " in panel " << getName() << llendl;
+        LLString err_str("Failed to find string " + name + " in panel " + getName());
+        // *TODO: once the QAR-369 ui-cleanup work on settings is in we need to change the following line to be
+        //if(LLUI::sConfigGroup->getBOOL("QAMode"))
+        if(LLUI::sQAMode)
+        {
+                llerrs << err_str << llendl;
+        }
+        else
+        {
+                llwarns << err_str << llendl;
+        }
         return LLString::null;
 }
 
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index d512957..51b1527 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -89,7 +89,7 @@ public:
         BOOL                    needsToScroll(S32 x, S32 y, SCROLL_ORIENTATION axis) const;
 
         // LLView functionality
-        virtual void    reshape(S32 width, S32 height, BOOL called_from_parent);
+        virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
         virtual BOOL    handleScrollWheel( S32 x, S32 y, S32 clicks );
         virtual BOOL    handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index eee2bcf..01c37d9 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -842,6 +842,9 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
         return not_too_big;
 }
 
+// NOTE: This is *very* expensive for large lists, especially when we are dirtying the list every frame
+//  while receiving a long list of names.
+// *TODO: Use bookkeeping to make this an incramental cost with item additions
 void LLScrollListCtrl::calcColumnWidths()
 {
         const S32 HEADING_TEXT_PADDING = 30;
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 07554b4..152bd05 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -64,7 +64,7 @@ public:
         /*virtual*/ void setValue(const LLSD& value);
         /*virtual*/ EWidgetType getWidgetType() const;
         /*virtual*/ LLString getWidgetTag() const;      
-        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
+        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         /*virtual*/ void draw();
         /*virtual*/ BOOL handleMouseDown( S32 x, S32 y, MASK mask );
         /*virtual*/ BOOL handleHover( S32 x, S32 y, MASK mask );
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 82d9069..7943129 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -95,7 +95,7 @@ public:
         virtual void    onMouseCaptureLost();
 
         // view overrides
-        virtual void    reshape(S32 width, S32 height, BOOL called_from_parent);
+        virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         virtual void    draw();
         virtual void    onFocusReceived();
         virtual void    onFocusLost();
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 5904573..ec8c94e 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -81,6 +81,7 @@ LLWindow*		LLUI::sWindow = NULL;
 LLHtmlHelp*             LLUI::sHtmlHelp = NULL;
 BOOL            LLUI::sShowXUINames = FALSE;
 std::stack<LLRect> LLScreenClipRect::sClipRectStack;
+BOOL            LLUI::sQAMode = FALSE;
 
 //
 // Functions
@@ -1759,6 +1760,12 @@ void LLUI::setHtmlHelp(LLHtmlHelp* html_help)
         LLUI::sHtmlHelp = html_help;
 }
 
+//static 
+void LLUI::setQAMode(BOOL b)
+{
+        LLUI::sQAMode = b;
+}
+
 LLScreenClipRect::LLScreenClipRect(const LLRect& rect, BOOL enabled) : mScissorState(GL_SCISSOR_TEST), mEnabled(enabled)
 {
         if (mEnabled)
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index c419cb6..9e275a5 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -201,6 +201,12 @@ public:
         static BOOL             sShowXUINames;
         static LLHtmlHelp*              sHtmlHelp;
 
+        // *TODO: remove the following when QAR-369 settings clean-up work is in.
+        // Also remove the call to this method which will then be obsolete.
+        // Search for QAR-369 below to enable the proper accessing of this feature. -MG
+        static void setQAMode(BOOL b);
+        static BOOL sQAMode;
+
 };
 
 // UI widgets
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index fbcb69e..e5415f8 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -633,13 +633,13 @@ void LLView::translate(S32 x, S32 y)
 }
 
 // virtual
-BOOL LLView::canSnapTo(const LLView* other_view) const
+BOOL LLView::canSnapTo(const LLView* other_view)
 {
         return other_view != this && other_view->getVisible();
 }
 
 // virtual
-void LLView::snappedTo(LLView* snap_view)
+void LLView::snappedTo(const LLView* snap_view)
 {
 }
 
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 52c7e3d..51c314a 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -108,9 +108,9 @@ virtual void	userSetShape(const LLRect& new_rect);
 virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0);
 virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0);
                 LLScrollListCtrl
-virtual BOOL    canSnapTo(const LLView* other_view) const { return other_view != this && other_view->getVisible(); }
+virtual BOOL    canSnapTo(const LLView* other_view) { return other_view != this && other_view->getVisible(); }
                 LLFloater
-virtual void    snappedTo(LLView* snap_view) {}
+virtual void    snappedTo(const LLView* snap_view) {}
                 LLFloater
 virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
                 *
@@ -339,9 +339,9 @@ public:
         virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0);
         virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0);
 
-        virtual BOOL    canSnapTo(const LLView* other_view) const;
+        virtual BOOL    canSnapTo(const LLView* other_view);
 
-        virtual void    snappedTo(LLView* snap_view);
+        virtual void    snappedTo(const LLView* snap_view);
 
         virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
         virtual BOOL    handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);