Merge remote-tracking branch 'jacek/next' into next

Conflicts (manualy merged):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/primbackup.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/notifications.xml

InWorldz specific crap removed.

3 files changed, 28 insertions, 6 deletions

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index e6b86c9..4bc5277 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -115,7 +115,9 @@ LLButton::LLButton(const std::string& name, const LLRect& rect,
                                    void *callback_data,
                                    const LLFontGL *font,
                                    const std::string& unselected_label, 
-                                   const std::string& selected_label )
+                                   const std::string& selected_label,
+                                   const std::string& disabled_label,
+                                   const std::string& disabled_selected_label)
 :       LLUICtrl(name, rect, TRUE, NULL, NULL),
         mClickedCallback( click_callback ),
         mMouseDownCallback( NULL ),
@@ -148,6 +150,8 @@ LLButton::LLButton(const std::string& name, const LLRect& rect,
 {
         mUnselectedLabel = unselected_label;
         mSelectedLabel = selected_label;
+        mDisabledLabel = disabled_label;
+        mDisabledSelectedLabel = disabled_selected_label;
 
         // by default, disabled color is same as enabled
         mImageColor = LLUI::sColorsGroup->getColor( "ButtonImageColor" );
@@ -989,6 +993,8 @@ LLXMLNodePtr LLButton::getXML(bool save_children) const
 
         node->createChild("label", TRUE)->setStringValue(getLabelUnselected());
         node->createChild("label_selected", TRUE)->setStringValue(getLabelSelected());
+        node->createChild("label_disabled", TRUE)->setStringValue(getLabelDisabled());
+        node->createChild("label_selected_disabled", TRUE)->setStringValue(getLabelDisabledSelected());
         node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
         node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(mHAlign));
 
@@ -1029,6 +1035,12 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
         std::string label_selected = label;
         node->getAttributeString("label_selected", label_selected);
 
+        std::string label_disabled = label;
+        node->getAttributeString("label_disabled", label_disabled);
+
+        std::string label_disabled_selected = label_selected;
+        node->getAttributeString("label_disabled_selected", label_disabled_selected);
+
         LLFontGL* font = selectFont(node);
 
         std::string     image_unselected;
@@ -1070,7 +1082,9 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
                         parent,
                         font,
                         label,
-                        label_selected);
+                        label_selected,
+                        label_disabled,
+                        label_disabled_selected);
 
         node->getAttributeS32("pad_right", button->mRightHPad);
         node->getAttributeS32("pad_left", button->mLeftHPad);
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index 2174d95..73ac446 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -84,7 +84,9 @@ public:
                          void *callback_data = NULL,
                          const LLFontGL* mGLFont = NULL,
                          const std::string& unselected_label = LLStringUtil::null,
-                         const std::string& selected_label = LLStringUtil::null );
+                         const std::string& selected_label = LLStringUtil::null,
+                         const std::string& disabled_label = LLStringUtil::null,
+                         const std::string& disabled_selected_label = LLStringUtil::null);
 
         virtual ~LLButton();
         void init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const std::string& control_name);
@@ -133,6 +135,8 @@ public:
 
         const std::string       getLabelUnselected() const { return wstring_to_utf8str(mUnselectedLabel); }
         const std::string       getLabelSelected() const { return wstring_to_utf8str(mSelectedLabel); }
+        const std::string       getLabelDisabled() const { return wstring_to_utf8str(mDisabledLabel); }
+        const std::string       getLabelDisabledSelected() const { return wstring_to_utf8str(mDisabledSelectedLabel); }
 
         void                    setImageColor(const std::string& color_control);
         void                    setImageColor(const LLColor4& c);
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 8117cde..989b12c 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -145,7 +145,6 @@ public:
 
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
-private:
         // Structure used to map tab buttons to and from tab panels
         struct LLTabTuple
         {
@@ -176,11 +175,12 @@ private:
                 LLTextBox*               mPlaceholderText;
                 S32                              mPadding;
         };
-
-        void initButtons();
         
         LLTabTuple* getTab(S32 index)           { return mTabList[index]; }
         LLTabTuple* getTabByPanel(LLPanel* child);
+
+        LLTextBox*      getTitle()                              { return mTitleBox; }
+
         void insertTuple(LLTabTuple * tuple, eInsertionPoint insertion_point);
 
         S32 getScrollPos() const                        { return mScrollPos; }
@@ -195,6 +195,10 @@ private:
         
         void setCurrentPanelIndex(S32 index) { mCurrentTabIdx = index; }
 
+private:
+
+        void initButtons();
+
         void scrollPrev() { mScrollPos = llmax(0, mScrollPos-1); } // No wrap
         void scrollNext() { mScrollPos = llmin(mScrollPos+1, mMaxScrollPos); } // No wrap