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.

1 files changed, 5 insertions, 1 deletions

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);