merge

9 files changed, 8 insertions, 15 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index b45e39a111..999cb9ed97 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -4,7 +4,6 @@
  can_dock="true"
  can_minimize="true"
  can_close="false"
- center_horiz="true"
  follows="bottom"
  height="152"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index a685094190..7d9a17548e 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -4,7 +4,6 @@
  can_dock="true"
  can_minimize="true"
  can_close="false"
- center_horiz="true"
  follows="bottom"
  height="110"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 6e82bb09ee..50d0011338 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- center_horiz="true"
- center_vert="true"
+ open_centered="true"
  default_tab_group="1"
  height="460"
  layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 3dc546aee3..f766fe5a5d 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -298,7 +298,7 @@
          layout="topleft"
          left="3"
          name="start"
-         top="-11"
+         top="-51"
          width="80" />
         <radio_item
          height="16"
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 80cb2723a0..fb583114c0 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -49,13 +49,10 @@
    name="test_menu_bar"
    top="16">
     <menu
-     height="16"
      label="Menu"
      layout="topleft"
      tear_off="true"
-     left="0"
      name="Menu"
-     top="-32"
      width="128">
       <!-- menu_item_call will trigger a function call in the C++ code -->
       <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index cc9e72cfb5..0c7ef3619d 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -580,7 +580,7 @@
          layout="topleft"
          left="0"
          name="radio select land"
-         top="-1"
+         top="-106"
          width="134" />
         <radio_item
          height="19"
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 233ab2c1b2..a53774a492 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -2,8 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- center_horiz="true"
- center_vert="true"
+ open_centered="true"
  height="600"
  layout="topleft"
  min_height="520"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 620aabeeb8..2cb91fe1f0 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -375,7 +375,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  layout="topleft"
                  name="chicklet_left_scroll_button"
                  tab_stop="false"
-                 top="-4"
+                 top="-28"
                  visible="false"
                  width="7" />
                 <button
@@ -392,7 +392,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  layout="topleft"
                  name="chicklet_right_scroll_button"
                  tab_stop="false"
-                 top="-4"
+                 top="-28"
                  visible="false"
                  width="7" />
             </chiclet_panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
index 16593751f7..3143b0a40c 100644
--- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
@@ -23,7 +23,7 @@
          name="notifications_list"
          sort_ascending="false"
          sort_column="2"
-         top="-78"
+         top="0"
          user_resize="true"
          width="100">
             <scroll_list.columns
@@ -48,7 +48,7 @@
          name="notification_rejects_list"
          sort_ascending="false"
          sort_column="2"
-         top="-78"
+         top="0"
          user_resize="true"
          width="100">
             <scroll_list.columns