From 68088a27ba92d8a3ce84ee6e5691e9e2e08b7b32 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Wed, 1 Jun 2011 21:33:46 +0300
Subject: STORM-1305 WIP Minor UI changes.

---
 .../xui/en/floater_environment_settings.xml        | 35 +++++++++++-----------
 .../default/xui/en/panel_region_environment.xml    |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
index fc509b8c59..1b1cafaca6 100644
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="338"
+ height="328"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
@@ -20,18 +20,6 @@
   wrap="true">
   Use the options below to customize the environment settings for your viewer.
  </text>
- <text
-  follows="top|left|right"
-  font="SansSerifItalic"
-  height="15"
-  layout="topleft"
-  left_delta="0"
-  name="note"
-  top_pad="-"
-  width="510"
-  wrap="true">
-  Note: if you choose to use your own settings, they will not be visible to other users.
- </text>
 
  <view_border
   bevel_style="none"  
@@ -55,7 +43,7 @@
   	 layout="topleft"
   	 name="use_region_settings"/>
     <radio_item
-  	 label="Use my settings"
+  	 label="Customize my environment"
   	 layout="topleft"
   	 name="use_my_settings"
   	 top_pad="20"/>
@@ -69,6 +57,19 @@
   top_pad="0"
   width="470">
 
+ <text
+  follows="top|left|right"
+  font="SansSerifItalic"
+  height="15"
+  layout="topleft"
+  left_delta="0"
+  name="note"
+  top_pad="0"
+  width="470"
+  wrap="true">
+  Note: your custom settings will not be visible to other users.
+ </text>
+
  <!-- Water Setting -->
  <text
   name="water_settings_title"
@@ -76,7 +77,7 @@
   height="16"
   layout="topleft"
   left="50"
-  top_pad="30"
+  top="40"
   width="200">
   		Water Setting
   </text>
@@ -84,7 +85,7 @@
    follows="top|left"
    left_pad="2"
    name="water_settings_preset_combo"
-   top_delta="-7"
+   top_delta="-5"
    width="200">
       <combo_box.item
        label="-Select a preset-"
@@ -99,7 +100,7 @@
   height="16"
   layout="topleft"
   left="50"
-  top_pad="30"
+  top_pad="20"
   width="100">
   		Sky / Day Cycle
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 332167a423..caa12010ca 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -40,7 +40,7 @@
    layout="topleft"
    name="use_sl_default_settings"/>
   <radio_item
-   label="Use my settings"
+   label="Use the following settings"
    layout="topleft"
    name="use_my_settings"
    top_pad="20"/>
-- 
cgit v1.2.3