merge

6 files changed, 32 insertions, 38 deletions

diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 1e0af1201f..706712ec5e 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -46,6 +46,28 @@ static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl");
 template class LLUICtrl* LLView::getChild<class LLUICtrl>(
 	const std::string& name, BOOL recurse) const;
 
+LLUICtrl::CallbackParam::CallbackParam()
+:	name("name"),
+	function_name("function"),
+	parameter("parameter"),
+	control_name("control") // Shortcut to control -> "control_name" for backwards compatability			
+{
+	addSynonym(parameter, "userdata");
+}
+
+LLUICtrl::EnableControls::EnableControls()
+:	enabled("enabled_control"),
+	disabled("disabled_control")
+{}
+
+LLUICtrl::ControlVisibility::ControlVisibility()
+:	visible("visibility_control"),
+	invisible("invisibility_control")
+{
+	addSynonym(visible, "visiblity_control");
+	addSynonym(invisible, "invisiblity_control");
+}
+
 LLUICtrl::Params::Params()
 :	tab_stop("tab_stop", true),
 	chrome("chrome", false),
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index ac916c9a43..b20ff5d798 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -75,14 +75,7 @@ public:
 
 		Optional<std::string>	control_name;
 		
-		CallbackParam()
-		  :	name("name"),
-			function_name("function"),
-			parameter("parameter"),
-			control_name("control") // Shortcut to control -> "control_name" for backwards compatability			
-		{
-			addSynonym(parameter, "userdata");
-		}
+		CallbackParam();
 	};
 
 	struct CommitCallbackParam : public LLInitParam::Block<CommitCallbackParam, CallbackParam >
@@ -105,23 +98,14 @@ public:
 		Alternative<std::string> enabled;
 		Alternative<std::string> disabled;
 		
-		EnableControls()
-		: enabled("enabled_control"),
-		  disabled("disabled_control")
-		{}
+		EnableControls();
 	};	
 	struct ControlVisibility : public LLInitParam::Choice<ControlVisibility>
 	{
 		Alternative<std::string> visible;
 		Alternative<std::string> invisible;
 
-		ControlVisibility()
-		:	visible("visibility_control"),
-			invisible("invisibility_control")
-		{
-			addSynonym(visible, "visiblity_control");
-			addSynonym(invisible, "invisiblity_control");
-		}
+		ControlVisibility();
 	};	
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
 	{
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index e7e8b1b858..23e4131e6d 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -83,6 +83,11 @@ template class LLView* LLView::getChild<class LLView>(
 
 static LLDefaultChildRegistry::Register<LLView> r("view");
 
+LLView::Follows::Follows()
+:   string(""),
+	flags("flags", FOLLOWS_LEFT | FOLLOWS_TOP)
+{}
+
 LLView::Params::Params()
 :	name("name", std::string("unnamed")),
 	enabled("enabled", true),
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 8ee05675c1..d485244a05 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -111,10 +111,7 @@ public:
 		Alternative<std::string>	string;
 		Alternative<U32>			flags;
 
-        Follows()
-		:   string(""),
-			flags("flags", FOLLOWS_LEFT | FOLLOWS_TOP)
-        {}
+        Follows();
 	};
 
 	struct Params : public LLInitParam::Block<Params>
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index 30eacec060..d2d92b46d4 100644
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
@@ -5,6 +5,7 @@
  name="floater_aaa"
  can_resize="true" 
  width="500">
+  <string name="bump_parabuild">1</string>
   <text_editor
   enabled="false"
   follows="all"
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 3aeb7c93e7..22787d029d 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -94,11 +94,7 @@ The 华文细黑 brown fox ヒラキjumped over the lazy dog.
       SansSerif BOLD UNDERLINE
     </text>
     <text
-   type="string"
-   length="1"
    bottom="390"
-   label="N"
-   layout="topleft"
    left="10"
    name="right_aligned_text"
    width="380"
@@ -107,11 +103,7 @@ The 华文细黑 brown fox ヒラキjumped over the lazy dog.
     Right aligned text
   </text>
   <text
- type="string"
- length="1"
  bottom="390"
- label="N"
- layout="topleft"
  left="10"
  name="centered_text"
  width="380"
@@ -120,11 +112,7 @@ The 华文细黑 brown fox ヒラキjumped over the lazy dog.
     Centered text
   </text>
   <text
- type="string"
- length="1"
  height="60"
- label="N"
- layout="topleft"
  left="10"
  name="left_aligned_text"
  width="380"
@@ -133,11 +121,8 @@ The 华文细黑 brown fox ヒラキjumped over the lazy dog.
     Left aligned text
   </text>
   <text
-   type="string"
-   length="1"
    bottom="390"
    label="N"
-   layout="topleft"
    left="10"
    name="floater_map_north"
    right="30"