1 files changed, 54 insertions, 53 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
index 401780f..df7b2a0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
@@ -5,49 +5,49 @@
 
   <!-- Grid Selector -->
   <text type="string" length="1" enabled="true" name="grid_selector_label"
-                height="10" width="100" left="5" top="-20"
+                height="16" width="100" left="10" top="-18"
                 h_pad="0" v_pad="0" halign="left"
                 font="SansSerif"
                 follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
             drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Select a grid:
+    Select a Grid:
   </text>
   
-  <scroll_list background_visible="true" bottom_delta="25" draw_border="true"
-             draw_stripes="false" 
-             follows="top|left|bottom" height="340" left="5" multi_select="false"
+  <scroll_list background_visible="true" bottom_delta="65" draw_border="true"
+             draw_stripes="true" 
+             follows="top|left|bottom" height="300" left="10" multi_select="false"
              name="grid_selector" width="170">
     <column label="" name="grid" width="200" />
   </scroll_list>
   
   <!-- Grid Selector Buttons -->
-  <button label="Add" label_selected="Delete" enabled="true" name="btn_add"
-                height="18" width="55" left="5" bottom_delta="-20"
+  <button label="Add New Grid" enabled="true" name="btn_add"
+                height="18" width="150" left="10" bottom_delta="-22"
                 halign="center"
                 follows="left|bottom" scale_image="true"
             font="SansSerifSmall" mouse_opaque="true" />
-  <button label="Copy" label_selected="Add" enabled="true" name="btn_copy"
-                height="18" width="55" left_delta="58" bottom_delta="0"
+  <button label="Duplicate Grid" enabled="true" name="btn_copy"
+                height="18" width="150" left_delta="0" bottom_delta="-20"
                 halign="center"
                 follows="left|bottom" scale_image="true"
             font="SansSerifSmall" mouse_opaque="true" />
-  <button label="Delete" label_selected="Copy" enabled="true" name="btn_delete"
-                height="18" width="55" left_delta="58" bottom_delta="0"
+  <button label="Delete Grid" enabled="true" name="btn_delete"
+                height="18" width="150" left_delta="0" bottom_delta="-20"
                 halign="center"
                 follows="left|bottom" scale_image="true"
             font="SansSerifSmall" mouse_opaque="true" />
 
   <!-- Grid Details -->
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     top="-25" drop_shadow_visible="true" follows="left|top"
+     top="-45" drop_shadow_visible="true" follows="left|top"
      font="SansSerif" h_pad="0" halign="left" height="16"
-     left_delta="60" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
-    Grid Name:
+     left="195" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
+    Grid name:
   </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="360"
-             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="40" mouse_opaque="true"
-             name="gridnick" select_all_on_focus_received="true" width="200" />
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="335" 
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" max_height="20" left_delta="90" max_length="40" mouse_opaque="true"
+             name="gridnick" select_all_on_focus_received="true" width="300" />
 
 
   <!--
@@ -107,95 +107,99 @@
   -->
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
-     font="SansSerif" h_pad="0" halign="left" height="16"
-     left_delta="-90" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
+        bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
+        font="SansSerif" h_pad="0" halign="left" height="16"
+        left_delta="-90" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
     Login URI:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="loginuri" select_all_on_focus_received="true" width="320" />
+              follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+              height="20" left_delta="90" max_length="255" mouse_opaque="true"
+              name="loginuri" select_all_on_focus_received="true" width="300" />
 
-  <button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
-                height="18" width="100" bottom_delta="-22"
-                halign="center"
-                follows="left|top" scale_image="true"
-          font="SansSerifSmall" mouse_opaque="true" />
+  <button label="Get Grid Info" enabled="true" name="btn_gridinfo"
+        height="18" width="100" bottom_delta="-25" left_delta="0" 
+        halign="center" follows="left|top" scale_image="true"
+        font="SansSerifSmall" mouse_opaque="true" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+        height="18" label="Clear All" left_delta="104"
+        mouse_opaque="true" name="btn_clear" scale_image="true" width="100" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-50" drop_shadow_visible="true" follows="left|top"
-   font="SansSerif" h_pad="0" halign="left" height="16"
-   left="182" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
-    Optional Fields
+      bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
+      font="SansSerif" h_pad="0" halign="left" height="16"
+      left="195" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+    Grid Info:
   </text>
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-     font="SansSerif" h_pad="0" halign="left" height="16"
-     left_delta="0" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
-    Login Page:
+     bottom_delta="-28" drop_shadow_visible="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="16"
+     left="205" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+    Login page:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
              height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="loginpage" select_all_on_focus_received="true" width="320" />
+             name="loginpage" select_all_on_focus_received="true" width="280" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
      bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-     font="SansSerif" h_pad="0" halign="left" height="16"
+     font="SansSerifSmall" h_pad="0" halign="left" height="16"
      left_delta="-90" mouse_opaque="true" name="helperuri_text" v_pad="0" width="120">
     Helper URI:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
              height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="helperuri" select_all_on_focus_received="true" width="320" />
+             name="helperuri" select_all_on_focus_received="true" width="280" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
    bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerif" h_pad="0" halign="left" height="16"
+   font="SansSerifSmall" h_pad="0" halign="left" height="16"
    left_delta="-90" mouse_opaque="true" name="website_text" v_pad="0" width="120">
     Website:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
              height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="website" select_all_on_focus_received="true" width="320" />
+             name="website" select_all_on_focus_received="true" width="280" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
    bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerif" h_pad="0" halign="left" height="16"
+   font="SansSerifSmall" h_pad="0" halign="left" height="16"
    left_delta="-90" mouse_opaque="true" name="support_text" v_pad="0" width="120">
     Support URL:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
              height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="support" select_all_on_focus_received="true" width="320" />
+             name="support" select_all_on_focus_received="true" width="280" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
    bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerif" h_pad="0" halign="left" height="16"
+   font="SansSerifSmall" h_pad="0" halign="left" height="16"
    left_delta="-90" mouse_opaque="true" name="register_text" v_pad="0" width="120">
     Account URL:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
              height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="register" select_all_on_focus_received="true" width="320" />
+             name="register" select_all_on_focus_received="true" width="280" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
    bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerif" h_pad="0" halign="left" height="16"
+   font="SansSerifSmall" h_pad="0" halign="left" height="16"
    left_delta="-90" mouse_opaque="true" name="password_text" v_pad="0" width="120">
     Password URL:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
              height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="password" select_all_on_focus_received="true" width="320" />
-  
-  <view_border bevel_style="none" border_thickness="1" bottom_delta="-4" follows="top|left" height="155" left_delta="-93" name="OptionalPrefsBorder" width="417" />
+             name="password" select_all_on_focus_received="true" width="280" />
+
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-10" 
+               follows="top|left|right" height="148" left="195" 
+               name="OptionalPrefsBorder" width="390" />
 
   <!-- Combo box for multi avatar grid manager avatar name
         <combo_box allow_text_entry="true" bevel_style="in" border_style="line" border_thickness="1"
@@ -252,9 +256,6 @@
   <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
      height="24" label="OK" label_selected="OK" left_delta="-104"
      mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" />
-  <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
-     height="24" label="Clear" label_selected="Clear" left_delta="-104"
-     mouse_opaque="true" name="btn_clear" scale_image="TRUE" width="100" />
   <!--
         <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
              left_delta="135" max_chars="40" mouse_opaque="true"