From 72afca57a75d61b56a2b72d06df26485ae391231 Mon Sep 17 00:00:00 2001
From: Erica Olsen <erica@lindenlab.com>
Date: Wed, 16 Sep 2009 00:28:50 +0000
Subject: EXT-973 Upgrade layout of Resident Chooser, grid options

---
 .../skins/default/xui/en/floater_build_options.xml | 40 ++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_build_options.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index af5c006779..f96aea3d90 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -1,71 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  follows="right"
- height="151"
+ height="140"
  layout="topleft"
  name="build options floater"
  save_rect="true"
  title="Grid Options"
- width="272">
+ width="245">
     <spinner
      control_name="GridResolution"
      follows="left|top"
-     height="16"
+     height="23"
      initial_value="1"
      label="Grid Unit (meters)"
-     label_width="110"
+     label_width="120"
      layout="topleft"
-     left="14"
+     left="10"
      max_val="5"
      min_val="0.01"
      name="GridResolution"
-     top="37"
-     width="170" />
+     top="25"
+     width="200" />
     <spinner
      control_name="GridDrawSize"
      decimal_digits="1"
      follows="left|top"
-     height="16"
+     height="23"
      increment="0.5"
      initial_value="5"
      label="Grid Extents (meters)"
-     label_width="110"
+     label_width="120"
      layout="topleft"
      left_delta="0"
      max_val="50"
      min_val="1"
      name="GridDrawSize"
-     top_pad="5"
-     width="170" />
+     top_pad="0"
+     width="200" />
     <check_box
      control_name="GridSubUnit"
      height="16"
-     label="Enable Sub-Unit Snapping"
+     label="Snap to Sub-Units"
      layout="topleft"
-     left_delta="0"
      name="GridSubUnit"
-     top_pad="5"
+     top_pad="0"
      width="200" />
     <check_box
      control_name="GridCrossSections"
      height="16"
-     label="Show Cross Sections"
+     label="View Cross Sections"
      layout="topleft"
-     left_delta="0"
      name="GridCrossSection"
-     top_pad="5"
+     top_pad="0"
      width="200" />
     <slider
      control_name="GridOpacity"
      follows="left"
-     height="16"
+     height="18"
      increment="0.05"
      initial_value="0.7"
-     label="Grid Opacity"
+     label="Opacity"
+     label_width="70"
      layout="topleft"
-     left_delta="0"
      name="GridOpacity"
      show_text="false"
      top_pad="5"
-     width="200" />
+     width="220" />
 </floater>
-- 
cgit v1.2.3


From 6fc22cf35c8fc45cda044f121d2d186ce021425e Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Mon, 21 Sep 2009 10:42:22 +0000
Subject: DEV-39997: merging all of the recent xui file updates from the
 viewer2help-1 branch into viewer-2.0.0-3, to avoid divergence.

This involves giving all floaters and side panels a help_topic
attribute, to specify a logical name for that UI element's page in the
help viewer. If you are creating/updating a floater or panel, please
consider adding a help_topic field. For details, see the wiki page on
XUI Documentation:

  https://wiki.lindenlab.com/wiki/XUI_Documentation#help_topic

I'm also merging in some updates to the lastest floater button
artwork to ensure these are 16x16 pixels.

(Note, the new help code is still being developed in viewer2help-1 and
is NOT being merged into 2.0 with this checkin. This is just data files.)
---
 indra/newview/skins/default/xui/en/floater_build_options.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_build_options.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index f96aea3d90..a65a159bd5 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -4,6 +4,7 @@
  height="140"
  layout="topleft"
  name="build options floater"
+ help_topic="build_options_floater"
  save_rect="true"
  title="Grid Options"
  width="245">
-- 
cgit v1.2.3


From 8bdd77f1fda47628815230fe6276bfae4cfb3b82 Mon Sep 17 00:00:00 2001
From: Erica Olsen <erica@lindenlab.com>
Date: Fri, 25 Sep 2009 01:39:13 +0000
Subject: EXT-1147 Update layout of grid options floater to be localizable

---
 .../skins/default/xui/en/floater_build_options.xml | 35 ++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_build_options.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index a65a159bd5..42a063928c 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  follows="right"
- height="140"
+ height="170"
  layout="topleft"
  name="build options floater"
  help_topic="build_options_floater"
  save_rect="true"
  title="Grid Options"
- width="245">
+ width="264">
     <spinner
      control_name="GridResolution"
      follows="left|top"
      height="23"
      initial_value="1"
-     label="Grid Unit (meters)"
-     label_width="120"
+     label="Grid Units (meters)"
+     label_width="130"
      layout="topleft"
      left="10"
      max_val="5"
@@ -30,7 +30,7 @@
      increment="0.5"
      initial_value="5"
      label="Grid Extents (meters)"
-     label_width="120"
+     label_width="130"
      layout="topleft"
      left_delta="0"
      max_val="50"
@@ -41,7 +41,7 @@
     <check_box
      control_name="GridSubUnit"
      height="16"
-     label="Snap to Sub-Units"
+     label="Snap to sub-units"
      layout="topleft"
      name="GridSubUnit"
      top_pad="0"
@@ -49,22 +49,33 @@
     <check_box
      control_name="GridCrossSections"
      height="16"
-     label="View Cross Sections"
+     label="View cross-sections"
      layout="topleft"
      name="GridCrossSection"
-     top_pad="0"
+     top_pad="5"
      width="200" />
+   <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="16"
+         layout="topleft"
+         left="10"
+         tool_tip="Grid Opacity"
+         name="grid_opacity_label"
+         top_pad="5"
+         width="128">
+            Opacity:
+   </text>
     <slider
      control_name="GridOpacity"
      follows="left"
      height="18"
      increment="0.05"
      initial_value="0.7"
-     label="Opacity"
-     label_width="70"
      layout="topleft"
      name="GridOpacity"
      show_text="false"
-     top_pad="5"
-     width="220" />
+     top_pad="0"
+     width="210" />
 </floater>
-- 
cgit v1.2.3