SL-10189, SL-10880: Mark the day instance so that it does not try to reanimate a day cycle when setting a fixed sky. Add new floater for setting the shared environment to local and allowing modifications.

2 files changed, 372 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
new file mode 100644
index 0000000000..e2cf809c9c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater layout="topleft"
+         name="env_adjust_snapshot"
+         help_topic="day_presets"
+         save_rect="false"
+         title="Personal Lighting"
+         width="845"
+         height="225"
+         min_width="500"
+         min_height="225"
+         single_instance="true"
+         can_resize="false">
+    <layout_stack name="outer_stack"
+                  width="845"
+                  height="212"
+                  follows="all"
+                  animate="false"
+                  top="0"
+                  orientation="vertical">
+        <!-- If I put in a timeline it would go here -->
+        <layout_panel name="env_controls"
+                      border="false"
+                      bevel_style="in"
+                      auto_resize="true"
+                      user_resize="true"
+                      height="150"
+                      min_height="0"
+                      visible="true">
+            <layout_stack name="settings_stack"
+                          width="855"
+                          height="150"
+                          follows="all"
+                          animate="false"
+                          orientation="horizontal">
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              visible="true"
+                              width="160"
+                              height="150">
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left="10"
+                          top="5"
+                          width="80">Ambient:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="ambient_light"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="10"
+                          width="80">Blue Horizon:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="blue_horizon"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="10"
+                          width="80">Blue Density:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="blue_density"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="right|top"
+                          height="10"
+                          layout="topleft"
+                          right="-10"
+                          top="5"
+                          width="60">Sun Color:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="sun_color"
+                                  top_pad="5"
+                                  width="60"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="0"
+                          top_pad="10"
+                          width="80">Cloud Color:</text>
+                    <color_swatch can_apply_immediately="true"
+                                  follows="left|top"
+                                  height="37"
+                                  label_height="0"
+                                  layout="topleft"
+                                  left_delta="0"
+                                  name="cloud_color"
+                                  top_pad="5"
+                                  width="60"/>
+                </layout_panel>
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              visible="true"
+                              width="200"
+                              height="150">
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="5"
+                          top_pad="5"
+                          width="80">Haze Horizon:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="5"
+                            name="haze_horizon"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="80">Haze Density:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="5"
+                            name="haze_density"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="185">Cloud Coverage:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="1"
+                            name="cloud_coverage"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="185">Cloud Scale:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0.01"
+                            max_val="3"
+                            name="cloud_scale"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="15"
+                          width="80">Scene Gamma:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            max_val="20"
+                            name="scene_gamma"
+                            top_pad="5"
+                            width="185"
+                            can_edit_text="true"/>
+                </layout_panel>
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              height="150"
+                              width="310"
+                              min_height="0"
+                              visible="true">
+                    <text follows="top|left"
+                          font="SansSerifBold"
+                          height="10"
+                          layout="topleft"
+                          name="label"
+                          left="5"
+                          top="5"
+                          width="105">Sun:</text>
+                    <sun_moon_trackball name="sun_rotation"
+                                        follows="left|top"
+                                        left_delta="0"
+                                        top_delta="20"
+                                        height="150"
+                                        width="150"
+                                        thumb_mode="sun"/>
+                    <check_box control_name="sunbeacon"
+                               width="60"
+                               height="16"
+                               label="Show Beacon"
+                               layout="topleft"
+                               name="sunbeacon"
+                               left_delta="55"
+                               bottom="-10"
+                               follows="bottom|right"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_pad="40"
+                          top="25"
+                          width="80">Scale:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0.25"
+                            max_val="20"
+                            name="sun_scale"
+                            top_delta="15"
+                            width="130"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="100">Glow Focus:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="-2"
+                            max_val="2"
+                            name="glow_focus"
+                            top_pad="5"
+                            width="130"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="5"
+                          width="200">Glow Size:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="1.99"
+                            name="glow_size"
+                            top_pad="5"
+                            width="130"
+                            can_edit_text="true"/>
+                    <text follows="left|top"
+                          height="10"
+                          layout="topleft"
+                          left_delta="-5"
+                          top_pad="10"
+                          width="200">Star Brightness:</text>
+                    <slider decimal_digits="2"
+                            follows="left|top"
+                            height="16"
+                            increment="0.01"
+                            initial_value="0"
+                            layout="topleft"
+                            left_delta="5"
+                            min_val="0"
+                            max_val="500"
+                            name="star_brightness"
+                            top_pad="5"
+                            width="130"
+                            can_edit_text="true"/>
+                </layout_panel>
+                <layout_panel border="false"
+                              bevel_style="in"
+                              auto_resize="false"
+                              user_resize="false"
+                              height="150"
+                              width="160"
+                              min_height="0"
+                              visible="true">
+                    <text follows="top|left"
+                          font="SansSerifBold"
+                          height="10"
+                          layout="topleft"
+                          name="label"
+                          left="5"
+                          top="5"
+                          width="105">Moon:</text>
+                    <sun_moon_trackball name="moon_rotation"
+                                        follows="left|top"
+                                        left_delta="0"
+                                        top_delta="20"
+                                        height="150"
+                                        width="150"
+                                        thumb_mode="moon"/>
+                    <check_box control_name="moonbeacon"
+                               width="60"
+                               height="16"
+                               label="Show Beacon"
+                               layout="topleft"
+                               name="moonbeacon"
+                               right="-50"
+                               bottom="-10"
+                               follows="bottom|right"/>
+                </layout_panel>
+            </layout_stack>
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f676df5e8b..2eab312ecd 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -715,6 +715,13 @@
                  function="World.EnvSettings"
                  parameter="my_environs" />
             </menu_item_call>
+            <menu_item_call
+             label="Personal Lighting..."
+             name="adjustment_tool">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
+                 parameter="adjust_tool" />
+            </menu_item_call>
             <menu_item_separator/>
             <menu_item_check
              label="Pause Clouds"