Merge

3 files changed, 38 insertions, 29 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 61299a43bd..c8843db28b 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
@@ -520,15 +520,6 @@ Select a key frame from the timeline above to edit settings.
                                 left_delta="0"
                                 top_pad="5"
                                 name="moon_panel" />
-                      <panel
-                                border="true"
-                                class="panel_settings_density"
-                                filename="panel_settings_sky_density.xml"
-                                label="Density"
-                                layout="topleft"
-                                left_delta="0"
-                                top_pad="5"
-                                name="panel_settings_sky_density" />
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
@@ -547,7 +538,7 @@ Select a key frame from the timeline above to edit settings.
                     left="5"
                     top_pad="0"
                     name="save_btn"
-                    width="150" />
+                    width="156" />
 
             <button
                     follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
index e3ed9a1741..84dacaa8b8 100644
--- a/indra/newview/skins/default/xui/en/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -5,46 +5,64 @@
         mouse_opaque="false"
         name="save_settings_menu"
         width="120">
-    <menu_item_call 
+    <menu_item_check
             name="save_settings" 
             label="Save">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="save" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="save"/>
-    </menu_item_call>
-    <menu_item_call 
+    </menu_item_check>
+    <menu_item_check 
             name="save_as_new_settings" 
             label="Save As">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="saveas" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="saveas" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="commit_changes"
             label="Commit">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="commit" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="commit" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="apply_local"
             label="Apply Only To Myself">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="local" />
+        <menu_item_check.on_click 
                 function="FlyoutCombo.Button.Action"
                 userdata="local" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="apply_parcel"
             label="Apply To Parcel">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="parcel" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="parcel" />
-    </menu_item_call>
-    <menu_item_call
+    </menu_item_check>
+    <menu_item_check
             name="apply_region"
             label="Apply To Region">
-        <menu_item_call.on_click 
+        <menu_item_check.on_check
+                function="FlyoutCombo.Button.Check"
+                userdata="region" />
+        <menu_item_check.on_click
                 function="FlyoutCombo.Button.Action"
                 userdata="region" />
-    </menu_item_call>
+    </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 4b72bbbe0e..0ec3528718 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -171,7 +171,7 @@
                     layout="topleft"
                     left_delta="5"
                     min_val="0"
-                    max_val="2"
+                    max_val="512"
                     name="star_brightness"
                     top_delta="15"
                     width="250"