From d693c5350933e664e5131c98babc7fbb2b4571aa Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 22 Jan 2019 22:01:00 +0200
Subject: SL-1932 Day Cycle Edit feature "Load Track" Part 1

---
 .../default/xui/en/floater_settings_picker.xml     | 46 ++++++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 7cc2c517ca..9ea949088f 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -13,10 +13,6 @@
         width="225">
 
     <!--  top static -->
-    <floater.string
-            name="choose_picture">
-        Click to choose a picture
-    </floater.string>
     <floater.string
             name="pick title">
         Pick:
@@ -30,10 +26,10 @@
             right="-6"
             bottom="-10"
             orientation="vertical">
-        <layout_panel name="temp"
+        <layout_panel name="inv_list"
                 border="false"
                 auto_resize="true"
-                user_resize="true"
+                user_resize="false"
                 height="29"
                 min_height="29"
                 bg_alpha_color="blue"
@@ -72,14 +68,48 @@
                     filter_asset_type="settings" />
             </panel>
         </layout_panel>
+        <layout_panel name="pnl_combo"
+                border="false"
+                auto_resize="false"
+                user_resize="false"
+                visible="true"
+                height="29"
+                bg_alpha_color="blue"
+                background_visible="false">
+            <combo_box
+             allow_text_entry="false"
+             follows="left|top"
+             height="23"
+             left="10"
+             max_chars="100"
+             mouse_opaque="true"
+             name="track_selection"
+             top="1"
+             width="190">
+                <combo_box.item
+                 label="Sky4"
+                 name="Sky4"
+                 value="4" />
+                <combo_box.item
+                 label="Sky3"
+                 name="Sky3"
+                 value="3" />
+                <combo_box.item
+                 label="Sky2"
+                 name="Sky2"
+                 value="2" />
+                <combo_box.item
+                 label="Ground"
+                 name="Ground"
+                 value="1" />
+            </combo_box>
+        </layout_panel>
         <layout_panel name="temp"
                 border="false"
                 auto_resize="false"
                 user_resize="false"
                 height="29"
                 min_height="29">
-            <!--                bg_alpha_color="red"
-                background_visible="true" -->
             <button
                     follows="top|left"
                     height="20"
-- 
cgit v1.2.3


From deac9ae7d84776d1f8497af82ed39e5d53e722d9 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 23 Jan 2019 20:33:41 +0200
Subject: SL-1932 Day Cycle Edit feature "Load Track" Part 2

---
 .../default/xui/en/floater_settings_picker.xml     | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
index 9ea949088f..55a1b540b4 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -17,6 +17,27 @@
             name="pick title">
         Pick:
     </floater.string>
+    <floater.string
+            name="pick_track">
+        SELECT TRACK
+    </floater.string>
+    <floater.string
+            name="pick_settings">
+        SELECT SETTINGS
+    </floater.string>
+
+    <floater.string
+            name="track_water">
+        Water
+    </floater.string>
+    <floater.string
+            name="track_ground">
+        Ground
+    </floater.string>
+    <floater.string
+            name="track_sky">
+        Sky[NUM]
+    </floater.string>
 
     <layout_stack name="test_stack"
             follows="all"
@@ -85,24 +106,7 @@
              mouse_opaque="true"
              name="track_selection"
              top="1"
-             width="190">
-                <combo_box.item
-                 label="Sky4"
-                 name="Sky4"
-                 value="4" />
-                <combo_box.item
-                 label="Sky3"
-                 name="Sky3"
-                 value="3" />
-                <combo_box.item
-                 label="Sky2"
-                 name="Sky2"
-                 value="2" />
-                <combo_box.item
-                 label="Ground"
-                 name="Ground"
-                 value="1" />
-            </combo_box>
+             width="190"/>
         </layout_panel>
         <layout_panel name="temp"
                 border="false"
-- 
cgit v1.2.3