Various editor fixes. Start adding a settings picker.

2 files changed, 295 insertions, 244 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 86c580f354..a1140b2532 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -41,7 +41,7 @@
                     left="15"
                     top="5"
                     width="105">
-              Day Cycle Name:
+                Day Cycle Name:
             </text>
             <line_editor
                     follows="top|left"
@@ -89,8 +89,8 @@
                         name="sky4_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="4" />
+                            function="DayCycle.Track"
+                            parameter="4" />
                 </button>
                 <button
                         follows="left|top"
@@ -102,8 +102,8 @@
                         name="sky3_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="3" />
+                            function="DayCycle.Track"
+                            parameter="3" />
                 </button>
                 <button
                         follows="left|top"
@@ -115,8 +115,8 @@
                         name="sky2_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="2" />
+                            function="DayCycle.Track"
+                            parameter="2" />
                 </button>
                 <button
                         follows="left|top"
@@ -128,8 +128,8 @@
                         name="sky1_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="1" />
+                            function="DayCycle.Track"
+                            parameter="1" />
                 </button>
                 <button
                         follows="left|top"
@@ -141,8 +141,8 @@
                         name="water_track"
                         width="100"> 
                     <button.commit_callback
-                      function="DayCycle.Track"
-                      parameter="0" />
+                            function="DayCycle.Track"
+                            parameter="0" />
                 </button>
             </panel>
             <panel name="timeline"
@@ -154,249 +154,289 @@
                     min_width="595"
                     left_pad="0"
                     visible="true">              
-    <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
+                <!-- Todo: These 5 tests might be subjected to a change to be dynamically generated, consider using layout_stack to get dynamic width adjustment-->
                 <text
-                         follows="left|top"
-                         height="15"
-                         layout="topleft"
-                         left="10"
-                         name="p0"
-                         top_pad="5"
-                         value="0%[DSC]"
-                         width="80" />
+                        follows="left|top"
+                        height="15"
+                        layout="topleft"
+                        left="10"
+                        name="p0"
+                        top_pad="5"
+                        value="0%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p1"
-                         top_delta="0"
-                         value="25%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p1"
+                        top_delta="0"
+                        value="25%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p2"
-                         top_delta="0"
-                         value="50%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p2"
+                        top_delta="0"
+                        value="50%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p3"
-                         top_delta="0"
-                         value="75%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p3"
+                        top_delta="0"
+                        value="75%[DSC]"
+                        width="80" />
                 <text
-                         follows="left|top|right"
-                         height="15"
-                         layout="topleft"
-                         left_pad="39"
-                         name="p4"
-                         top_delta="0"
-                         value="100%[DSC]"
-                         width="80" />
+                        follows="left|top|right"
+                        height="15"
+                        layout="topleft"
+                        left_pad="39"
+                        name="p4"
+                        top_delta="0"
+                        value="100%[DSC]"
+                        width="80" />
                 <multi_slider
-                    decimal_digits="0"
-                    draw_track="false"
-                    follows="bottom"
-                    height="10"
-                    increment="0.01"
-                    initial_value="0"
-                    layout="topleft"
-                    left="10"
-                    max_sliders="1"
-                    max_val="1"
-                    name="WLTimeSlider"
-                    show_text="false"
-                    top_pad="0"
-                    use_triangle="true"
-                    width="525" />
+                        decimal_digits="0"
+                        draw_track="false"
+                        follows="bottom"
+                        height="10"
+                        increment="0.01"
+                        initial_value="0"
+                        layout="topleft"
+                        left="10"
+                        max_sliders="1"
+                        max_val="1"
+                        name="WLTimeSlider"
+                        show_text="false"
+                        top_pad="0"
+                        use_triangle="true"
+                        width="525" />
 
                 <multi_slider
-                      decimal_digits="0"
-                      follows="bottom"
-                      height="10"
-                      increment="0.01"
-                      initial_value="0"
-                      layout="topleft"
-                      left="10"
-                      max_sliders="20"
-                      max_val="1"
-                      name="WLDayCycleFrames"
-                      show_text="false"
-                      top_pad="15"
-                      width="525" />
+                        decimal_digits="0"
+                        follows="bottom"
+                        height="10"
+                        increment="0.01"
+                        initial_value="0"
+                        layout="topleft"
+                        left="10"
+                        max_sliders="20"
+                        max_val="1"
+                        name="WLDayCycleFrames"
+                        show_text="false"
+                        top_pad="15"
+                        width="525" />
 
                 <text
-                      follows="left|bottom"
-                      height="20"
-                      layout="topleft"
-                      left_pad="0"
-                      name="current_time"
-                      value="[PRCNT]%[DSC]"
-                      top_delta="-5"
-                      width="70" />
+                        follows="left|bottom"
+                        height="20"
+                        layout="topleft"
+                        left_pad="0"
+                        name="current_time"
+                        value="[PRCNT]%[DSC]"
+                        top_delta="-5"
+                        width="70" />
 
                 <layout_stack
-                name="progress_control"
-                follows="top|left"
-                height="25"
-                width="83"
-                layout="topleft"
-                animate="false"
-                left="225"
-                top_pad="40"
-                orientation="horizontal">
+                        name="progress_control"
+                        follows="top|left"
+                        height="25"
+                        width="83"
+                        layout="topleft"
+                        animate="false"
+                        left="225"
+                        top_pad="40"
+                        orientation="horizontal">
 
                     <layout_panel
-                  name="skip_back"
-                  mouse_opaque="false"
-                  auto_resize="false"
-                  layout="topleft"
-                  top="0"
-                  height="25"
-                  min_width="25"
-                  width="25">
+                            name="skip_back"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25">
                         <button
-                         name="skip_back_btn"
-                         follows="top"
-                         image_overlay="SkipBackward_Off"
-                         image_disabled="PushButton_Disabled"
-                         image_disabled_selected="PushButton_Disabled"
-                         image_selected="PushButton_Selected"
-                         image_unselected="PushButton_Off"
-                         hover_glow_amount="0.15"
-                         auto_resize="false"
-                         width="25"
-                         height="25"
-                         layout="topleft"
-                         tool_tip="Step back"
-                         top="0"
-                         left="0">
+                                name="skip_back_btn"
+                                follows="top"
+                                image_overlay="SkipBackward_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                auto_resize="false"
+                                width="25"
+                                height="25"
+                                layout="topleft"
+                                tool_tip="Step back"
+                                top="0"
+                                left="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="back" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="back" />
                         </button>
                     </layout_panel>
 
                     <layout_panel
-                  name="play_layout"
-                  mouse_opaque="false"
-                  auto_resize="false"
-                  layout="topleft"
-                  top="0"
-                  height="25"
-                  min_width="25"
-                  width="25">
+                            name="play_layout"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25">
                         <button
-                        name="play_btn"
-                        follows="top"
-                        image_overlay="Play_Off"
-                        image_disabled="PushButton_Disabled"
-                        image_disabled_selected="PushButton_Disabled"
-                        image_selected="PushButton_Selected"
-                        image_unselected="PushButton_Off"
-                        hover_glow_amount="0.15"
-                        auto_resize="false"
-                        layout="topleft"
-                        height="25"
-                        width="25"
-                        left="0"
-                        top="0">
+                                name="play_btn"
+                                follows="top"
+                                image_overlay="Play_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                auto_resize="false"
+                                layout="topleft"
+                                height="25"
+                                width="25"
+                                left="0"
+                                top="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="play" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="play" />
                         </button>
                     </layout_panel>
 
                     <layout_panel
-                  name="pause_layout"
-                  mouse_opaque="false"
-                  auto_resize="false"
-                  layout="topleft"
-                  top="0"
-                  height="25"
-                  min_width="25"
-                  width="25"
-                  visible="false">
+                            name="pause_layout"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25"
+                            visible="false">
                         <button
-                        name="pause_btn"
-                        follows="top"
-                        image_overlay="Pause_Off"
-                        image_disabled="PushButton_Disabled"
-                        image_disabled_selected="PushButton_Disabled"
-                        image_selected="PushButton_Selected"
-                        image_unselected="PushButton_Off"
-                        hover_glow_amount="0.15"
-                        auto_resize="false"
-                        layout="topleft"
-                        height="25"
-                        width="25"
-                        left="0"
-                        top="0">
+                                name="pause_btn"
+                                follows="top"
+                                image_overlay="Pause_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                auto_resize="false"
+                                layout="topleft"
+                                height="25"
+                                width="25"
+                                left="0"
+                                top="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="pause" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="pause" />
                         </button>
                     </layout_panel>
 
                     <layout_panel
-                     name="skip_forward"
-                     mouse_opaque="false"
-                     auto_resize="false"
-                     layout="topleft"
-                     top="0"
-                     height="25"
-                     min_width="25"
-                     width="25">
+                            name="skip_forward"
+                            mouse_opaque="false"
+                            auto_resize="false"
+                            layout="topleft"
+                            top="0"
+                            height="25"
+                            min_width="25"
+                            width="25">
                         <button
-                         name="skip_forward_btn"
-                         follows="top"
-                         image_overlay="SkipForward_Off"
-                         image_disabled="PushButton_Disabled"
-                         image_disabled_selected="PushButton_Disabled"
-                         image_selected="PushButton_Selected"
-                         image_unselected="PushButton_Off"
-                         hover_glow_amount="0.15"
-                         width="25"
-                         height="25"
-                         layout="topleft"
-                         tool_tip="Step forward"
-                         top="0">
+                                name="skip_forward_btn"
+                                follows="top"
+                                image_overlay="SkipForward_Off"
+                                image_disabled="PushButton_Disabled"
+                                image_disabled_selected="PushButton_Disabled"
+                                image_selected="PushButton_Selected"
+                                image_unselected="PushButton_Off"
+                                hover_glow_amount="0.15"
+                                width="25"
+                                height="25"
+                                layout="topleft"
+                                tool_tip="Step forward"
+                                top="0">
                             <button.commit_callback
-                                function="DayCycle.PlayActions"
-                                parameter="forward" />
+                                    function="DayCycle.PlayActions"
+                                    parameter="forward" />
                         </button>
                     </layout_panel>
                 </layout_stack>
 
                 <button
-                    follows="top|left"
-                    height="23"
-                    width="90"
-                    label="Add Frame"
-                    left_pad="175"
-                    top_delta="-12"
-                    name="add_frame" />
+                        follows="top|left"
+                        height="23"
+                        width="90"
+                        label="Add Frame"
+                        left_pad="175"
+                        top_delta="-12"
+                        name="add_frame" />
                 <button
-                    follows="left|top"
-                    height="23"
-                    width="90"
-                    label="Delete Frame"
-                    top_pad="0"
-                    left_delta="0"
-                    name="delete_frame" />
+                        follows="left|top"
+                        height="23"
+                        width="90"
+                        label="Delete Frame"
+                        top_pad="0"
+                        left_delta="0"
+                        name="delete_frame" />
             </panel>
         </layout_panel>
+        <layout_panel name="frame_edit_controls"
+                auto_resize="false"
+                user_resize="true"
+                height="30"
+                width="700"
+                min_height="30"
+                visible="true">
+            <!--bg_alpha_color="blue"
+                background_visible="true" -->
+            <icon 
+                    border="1"
+                    bevel_style="out"
+                    name="icn_lock_edit"
+                    layout="bottomleft"
+                    follows="bottom"
+                    image_name="Locked_Icon"
+                    bottom="4"
+                    left="5"
+                    height="15"
+                    width="15"
+                    tab_stop="false" 
+                    visible="false"
+                    tool_tip="Select a key frame above to edit settings"/>
+            <button
+                    name="btn_load_frame"
+                    follows="top"
+                    image_overlay="Command_Inventory_Icon"
+                    image_disabled="PushButton_Disabled"
+                    image_disabled_selected="PushButton_Disabled"
+                    image_selected="PushButton_Selected"
+                    image_unselected="PushButton_Off"
+                    hover_glow_amount="0.15"
+                    auto_resize="false"
+                    layout="topleft"
+                    height="30"
+                    width="30"
+                    left="25"
+                    top="1"
+                    tool_tip="Replace frame with settings from inventory"/>
+        </layout_panel>
         <layout_panel name="frame_settings_water"
                 auto_resize="false"
                 user_resize="true"
-                height="386"
+                height="351"
                 width="700"
                 min_height="0"
                 visible="false">
@@ -413,20 +453,20 @@
                     top_pad="0"
                     width="700">
                 <panel
-                         border="true"
-                         class="panel_settings_water"
-                         filename="panel_settings_water.xml"
-                         label="Water"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="water_panel"/>
+                        border="true"
+                        class="panel_settings_water"
+                        filename="panel_settings_water.xml"
+                        label="Water"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="water_panel"/>
             </tab_container>
         </layout_panel>
         <layout_panel name="frame_settings_sky"
                 auto_resize="false"
                 user_resize="true"
-                height="386"
+                height="351"
                 width="700"
                 min_height="0"
                 visible="true">
@@ -444,32 +484,32 @@
                     top_pad="0"
                     width="700">
                 <panel
-                         border="true"
-                         class="panel_settings_atmos"
-                         filename="panel_settings_sky_atmos.xml"
-                         label="Atmosphere &amp; Lighting"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="atmosphere_panel" />
+                        border="true"
+                        class="panel_settings_atmos"
+                        filename="panel_settings_sky_atmos.xml"
+                        label="Atmosphere &amp; Lighting"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="atmosphere_panel" />
                 <panel
-                         border="true"
-                         class="panel_settings_cloud"
-                         filename="panel_settings_sky_clouds.xml"
-                         label="Clouds"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="clouds_panel" />
+                        border="true"
+                        class="panel_settings_cloud"
+                        filename="panel_settings_sky_clouds.xml"
+                        label="Clouds"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="clouds_panel" />
                 <panel
-                         border="true"
-                         class="panel_settings_sunmoon"
-                         filename="panel_settings_sky_sunmoon.xml"
-                         label="Sun &amp; Moon"
-                         layout="topleft"
-                         left_delta="0"
-                         top_pad="5"
-                         name="moon_panel" />
+                        border="true"
+                        class="panel_settings_sunmoon"
+                        filename="panel_settings_sky_sunmoon.xml"
+                        label="Sun &amp; Moon"
+                        layout="topleft"
+                        left_delta="0"
+                        top_pad="5"
+                        name="moon_panel" />
             </tab_container>
         </layout_panel>
         <layout_panel name="buttons"
@@ -486,7 +526,7 @@
                     left="5"
                     top_pad="0"
                     name="save_btn"
-                    width="100" />
+                    width="150" />
 
             <button
                     follows="top|left"
@@ -510,7 +550,7 @@
                     layout="topleft"
                     left_pad="10"
                     name="cancel_btn"
-                    width="100" /> 
+                    width="150" /> 
 
         </layout_panel>
     </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_settings_picker.xml b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
new file mode 100644
index 0000000000..75bef9f680
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_settings_picker.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+        height="602"
+        layout="topleft"
+        name="floater_settings_picker"
+        help_topic=""
+        save_rect="true"
+        title="Settings Selector"
+        width="705">
+        
+</floater>