Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.

svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8

3 files changed, 10 insertions, 13 deletions

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index d7c0cf4f7b..43c22cbf5d 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -115,6 +115,7 @@ LLLineEditor::Params::Params()
 	mouse_opaque = true;
 	addSynonym(select_on_focus, "select_all_on_focus_received");
 	addSynonym(border, "border");
+	addSynonym(label, "watermark_text");
 }
 
 LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index 5893fcd64b..2d70432182 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -60,7 +60,9 @@ LLSpinCtrl::Params::Params()
 	decimal_digits("decimal_digits"),
 	allow_text_entry("allow_text_entry", true),
 	text_enabled_color("text_enabled_color"),
-	text_disabled_color("text_disabled_color")
+	text_disabled_color("text_disabled_color"),
+	up_button("up_button"),
+	down_button("down_button")
 {}
 
 LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p)
@@ -103,38 +105,28 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p)
 	S32 btn_right = btn_left + spinctrl_btn_width;
 	
 	// Spin buttons
-	LLButton::Params up_button_params;
-	up_button_params.name(std::string("SpinCtrl Up"));
+	LLButton::Params up_button_params(p.up_button);
 	up_button_params.rect
 					.left(btn_left)
 					.top(top)
 					.right(btn_right)
 					.height(spinctrl_btn_height);
-	up_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
-	up_button_params.image_unselected.name("ScrollArrow_Up");
-	up_button_params.image_selected.name("ScrollArrow_Up");
 	up_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
 	up_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
-	up_button_params.tab_stop(false);
 
 	mUpBtn = LLUICtrlFactory::create<LLButton>(up_button_params);
 	addChild(mUpBtn);
 
 	LLRect down_rect( btn_left, top - spinctrl_btn_height, btn_right, bottom );
 
-	LLButton::Params down_button_params;
-	down_button_params.name(std::string("SpinCtrl Down"));
+	LLButton::Params down_button_params(p.down_button);
 	down_button_params.rect
 					.left(btn_left)
 					.right(btn_right)
 					.bottom(bottom)
 					.height(spinctrl_btn_height);
-	down_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
-	down_button_params.image_unselected.name("ScrollArrow_Down");
-	down_button_params.image_selected.name("ScrollArrow_Down");
 	down_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
 	down_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
-	down_button_params.tab_stop(false);
 	mDownBtn = LLUICtrlFactory::create<LLButton>(down_button_params);
 	addChild(mDownBtn);
 
diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h
index eb1a2eb8a7..0e610b7741 100644
--- a/indra/llui/llspinctrl.h
+++ b/indra/llui/llspinctrl.h
@@ -35,6 +35,7 @@
 
 
 #include "stdtypes.h"
+#include "llbutton.h"
 #include "llf32uictrl.h"
 #include "v4color.h"
 #include "llrect.h"
@@ -53,6 +54,9 @@ public:
 		Optional<LLUIColor> text_enabled_color;
 		Optional<LLUIColor> text_disabled_color;
 
+		Optional<LLButton::Params> up_button;
+		Optional<LLButton::Params> down_button;
+
 		Params();
 	};
 protected: