merge

3 files changed, 58 insertions, 15 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index 8cdafe110a..d2b8455eab 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -83,7 +83,7 @@
         Loading...
     </text_editor>
     <button
-     follows="left|bottom"
+     follows="right|bottom"
      height="22"
      label="Save"
      label_selected="Save"
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 8305452c85..c33ab8aa70 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -114,16 +114,59 @@
         Escaped greater than &gt;
     </text>
     <text
-     type="string"
-     length="1"
-     bottom="390"
-     label="N"
-     layout="topleft"
-     left="10"
-     name="floater_map_north"
-     right="30"
-     text_color="1 1 1 0.7"
-     top="370">
-        N
-    </text>
+   type="string"
+   length="1"
+   bottom="390"
+   label="N"
+   layout="topleft"
+   left="10"
+   name="right_aligned_text"
+   width="380"
+   halign="right" 
+   text_color="1 1 1 0.7"
+   top_pad="10">
+    Right aligned text
+  </text>
+  <text
+ type="string"
+ length="1"
+ bottom="390"
+ label="N"
+ layout="topleft"
+ left="10"
+ name="centered_text"
+ width="380"
+ halign="center"
+ text_color="1 1 1 0.7"
+ top_pad="10">
+    Centered text
+  </text>
+  <text
+ type="string"
+ length="1"
+ bottom="390"
+ label="N"
+ layout="topleft"
+ left="10"
+ name="centered_text"
+ width="380"
+ halign="left"
+ text_color="1 1 1 0.7"
+ top_pad="10">
+    Left aligned text
+  </text>
+  <text
+   type="string"
+   length="1"
+   bottom="390"
+   label="N"
+   layout="topleft"
+   left="10"
+   name="floater_map_north"
+   right="30"
+   text_color="1 1 1 0.7"
+   top="370">
+    N
+  </text>
+
 </floater>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index b72d59524e..502c396ed8 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -4,8 +4,8 @@
     message_separator="panel_chat_separator.xml"
     left_text_pad="10"
 	right_text_pad="15"
-    left_widget_pad="5"
-	rigth_widget_pad="10"
+    left_widget_pad="0"
+	right_widget_pad="0"
 	max_length="2147483647"
 	enabled="false"
 	track_bottom="true"