From dab554d10613230ae7a65b8b699572d7244affbc Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Fri, 29 Apr 2011 17:59:50 +0300
Subject: STORM-1205 Add "Environment" tab to the "Region/Estate" floater
 STORM-1201 Mockup: "Create/Edit Sky Preset" floater STORM-1199 Mockup:
 "Delete Water/Sky Preset", "Delete Day Cycle" floaters STORM-1198 Mockup:
 "Create/Edit Day Cycle" floater STORM-1197 Mockup: "Create/Edit Water Preset"
 floater STORM-1196 Mockup: Environment Settings floater

---
 .../xui/en/floater_environment_settings.xml        | 140 +++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_environment_settings.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
new file mode 100644
index 0000000000..77cad2a2bd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="400"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="ENVIRONMENT EDITOR"
+ width="600">
+ 
+ <!-- Water Settings -->
+ <view_border
+  bevel_style="none"  
+  follows="top|left"
+  height="100"
+  layout="topleft"
+  left="50"
+  name="water_panel"
+  top="50"
+  width="500"/> 
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left_delta="5"
+  top_delta="5"
+  width="35">
+  		Water
+  </text>
+  
+  <radio_group
+   follows="top|left"
+   height="45"
+   layout="topleft"
+   name="water_settings_radio_group"   
+   top_pad="20"
+   width="200">
+  	<radio_item  	 
+  	 label="Use region settings"
+  	 layout="topleft"
+  	 name="region_water_settings"/>
+  	<radio_item  	 
+  	 label="Use my settings"
+  	 layout="topleft"
+  	 name="my_water_settings"
+  	 top_pad="20"/>  	
+  </radio_group>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="water_settings_preset_combo"
+   top_delta="24"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>
+ 
+ 
+ <!-- Sky/Day Cycle Settings -->  
+ <view_border
+  bevel_style="none"  
+  follows="top|left"
+  height="180"
+  layout="topleft"
+  left="50"
+  name="sky_dayc_panel"
+  top="175"
+  width="500"/> 
+ <text
+  name="sky_dayc_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left="55"
+  top_delta="5"
+  width="100">
+  		Sky / Day Cycle
+  </text>
+  
+  <radio_group
+   follows="top|left"
+   height="45"
+   layout="topleft"
+   name="sky_dayc_settings_radio_group1"
+   top_pad="20"
+   width="200">
+  	<radio_item
+  	 layout="topleft"
+  	 label="Use region settings"
+  	 name="region_sky_dayc_settings"/>
+  	<radio_item
+  	 layout="topleft"
+  	 label="Use my settings"
+  	 name="my_sky_dayc_settings"
+  	 top_pad="20"/>  	
+  </radio_group>
+  
+  <radio_group
+   layout="topleft"
+   left_delta="50"
+   name="sky_dayc_settings_radio_group2"
+   top_pad="10"
+   height="50"
+   width="150">
+  	<radio_item
+  	 layout="topleft"
+  	 label="Fixed sky"
+  	 name="my_sky_settings"/>
+  	<radio_item
+  	 layout="topleft"
+  	 label="Day cycle"
+  	 name="my_dayc_settings"
+  	 top_pad="25"/>  	
+  </radio_group>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="sky_settings_preset_combo"
+   top_delta="-7"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>
+    <combo_box
+   follows="top|left"
+   name="dayc_settings_preset_combo"
+   top_delta="36"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>		
+</floater>
-- 
cgit v1.2.3


From ec749bb1c1fa143c6019791d6713d85f05510e53 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Tue, 17 May 2011 17:09:15 +0300
Subject: STORM-1244 FIXED Environment Settings floater implementation.

---
 .../xui/en/floater_environment_settings.xml        | 131 ++++++++++-----------
 1 file changed, 64 insertions(+), 67 deletions(-)

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

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 77cad2a2bd..8460530f97 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="400"
+ height="350"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
@@ -9,100 +9,80 @@
  title="ENVIRONMENT EDITOR"
  width="600">
  
- <!-- Water Settings -->
  <view_border
   bevel_style="none"  
   follows="top|left"
-  height="100"
+  height="237"
   layout="topleft"
   left="50"
-  name="water_panel"
+  name="border"
   top="50"
-  width="500"/> 
- <text
-  name="water_settings_title"
+  width="500"/>  
+ <radio_group
   follows="top|left"
-  height="16"
+  height="45"
   layout="topleft"
-  left_delta="5"
-  top_delta="5"
-  width="35">
-  		Water
-  </text>
-  
-  <radio_group
-   follows="top|left"
-   height="45"
-   layout="topleft"
-   name="water_settings_radio_group"   
-   top_pad="20"
-   width="200">
-  	<radio_item  	 
+  left_delta="10"
+  name="region_settings_radio_group"
+  top_delta="20"
+  width="200">
+    <radio_item
   	 label="Use region settings"
   	 layout="topleft"
-  	 name="region_water_settings"/>
-  	<radio_item  	 
+  	 name="use_region_settings"/>
+    <radio_item
   	 label="Use my settings"
   	 layout="topleft"
-  	 name="my_water_settings"
-  	 top_pad="20"/>  	
+  	 name="use_my_settings"
+  	 top_pad="20"/>
   </radio_group>
+
+ <panel
+  height="170"
+  layout="topleft"
+  left="50"
+  name="user_environment_settings"
+  top_pad="0"
+  width="500">
+
+ <!-- Water Setting -->
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left="50"
+  top_pad="30"
+  width="200">
+  		Water Setting
+  </text>
   <combo_box
    follows="top|left"
    left_pad="2"
    name="water_settings_preset_combo"
-   top_delta="24"
+   top_delta="-7"
    width="200">
       <combo_box.item
        label="-Select a preset-"
-       name="item0"
-       value="any" />
+       name="item0"/>
   </combo_box>
  
- 
+
  <!-- Sky/Day Cycle Settings -->  
- <view_border
-  bevel_style="none"  
-  follows="top|left"
-  height="180"
-  layout="topleft"
-  left="50"
-  name="sky_dayc_panel"
-  top="175"
-  width="500"/> 
  <text
   name="sky_dayc_settings_title"
   follows="top|left"
   height="16"
   layout="topleft"
-  left="55"
-  top_delta="5"
+  left="50"
+  top_pad="30"
   width="100">
   		Sky / Day Cycle
   </text>
-  
-  <radio_group
-   follows="top|left"
-   height="45"
-   layout="topleft"
-   name="sky_dayc_settings_radio_group1"
-   top_pad="20"
-   width="200">
-  	<radio_item
-  	 layout="topleft"
-  	 label="Use region settings"
-  	 name="region_sky_dayc_settings"/>
-  	<radio_item
-  	 layout="topleft"
-  	 label="Use my settings"
-  	 name="my_sky_dayc_settings"
-  	 top_pad="20"/>  	
-  </radio_group>
-  
   <radio_group
    layout="topleft"
    left_delta="50"
-   name="sky_dayc_settings_radio_group2"
+   name="sky_dayc_settings_radio_group"
    top_pad="10"
    height="50"
    width="150">
@@ -124,17 +104,34 @@
    width="200">
       <combo_box.item
        label="-Select a preset-"
-       name="item0"
-       value="any" />
+       name="item0"/>
   </combo_box>
-    <combo_box
+  <combo_box
    follows="top|left"
    name="dayc_settings_preset_combo"
    top_delta="36"
    width="200">
       <combo_box.item
        label="-Select a preset-"
-       name="item0"
-       value="any" />
-  </combo_box>		
+       name="item0"/>
+  </combo_box>
+  </panel>
+
+  <button
+   follows="left|top"
+   height="23"
+   label="OK"
+   layout="topleft"
+   right="-160"
+   name="ok_btn"
+   top_pad="20"
+   width="100" />
+  <button
+   follows="left|top"
+   height="23"
+   label="Cancel"
+   layout="topleft"
+   left_pad="10"
+   name="cancel_btn"
+   width="100" />	
 </floater>
-- 
cgit v1.2.3


From 4a882c82dcc236b9154087cdd886d3dd076099c9 Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Tue, 17 May 2011 18:16:16 +0300
Subject: STORM-1196 ADDITIONAL FIX Mockup: Environment Settings floater

- Decreased a little bit size of the Environment Settings floater
---
 .../newview/skins/default/xui/en/floater_environment_settings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

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 8460530f97..48c8bc75d1 100644
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="350"
+ height="338"
  layout="topleft"
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
  save_rect="true"
  title="ENVIRONMENT EDITOR"
- width="600">
+ width="540">
  
  <view_border
   bevel_style="none"  
   follows="top|left"
   height="237"
   layout="topleft"
-  left="50"
+  left="20"
   name="border"
-  top="50"
+  top="38"
   width="500"/>  
  <radio_group
   follows="top|left"
-- 
cgit v1.2.3


From 19084baefd90a8dd298e123e28c22fa0f2e440e0 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Mon, 30 May 2011 22:51:35 +0300
Subject: STORM-1244 Minor visual changes in the Environment Settings floater.

* Changed title.
* Added hints at the top.
* Minor layout fixes.
---
 .../xui/en/floater_environment_settings.xml        | 36 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

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

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 48c8bc75d1..fc509b8c59 100644
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -6,9 +6,33 @@
  name="Environment Editor Floater"
  help_topic="environment_editor_floater"
  save_rect="true"
- title="ENVIRONMENT EDITOR"
+ title="ENVIRONMENT SETTINGS"
  width="540">
- 
+
+ <text
+  follows="top|left|right"
+  height="15"
+  layout="topleft"
+  left="20"
+  name="note"
+  top="25"
+  width="510"
+  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"  
   follows="top|left"
@@ -16,7 +40,7 @@
   layout="topleft"
   left="20"
   name="border"
-  top="38"
+  top_pad="8"
   width="500"/>  
  <radio_group
   follows="top|left"
@@ -43,7 +67,7 @@
   left="50"
   name="user_environment_settings"
   top_pad="0"
-  width="500">
+  width="470">
 
  <!-- Water Setting -->
  <text
@@ -122,9 +146,9 @@
    height="23"
    label="OK"
    layout="topleft"
-   right="-160"
+   right="-130"
    name="ok_btn"
-   top_pad="20"
+   top_pad="10"
    width="100" />
   <button
    follows="left|top"
-- 
cgit v1.2.3


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 +++++++++++-----------
 1 file changed, 18 insertions(+), 17 deletions(-)

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

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>
-- 
cgit v1.2.3