From a4137d72ebc9f49dfd8bd124b255da0dfbc4ba92 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 3 Jul 2018 14:18:24 -0700
Subject: MAINT-8821: New "My Environments" floater.  First pass.

---
 .../default/xui/en/floater_my_environments.xml     | 184 +++++++++++++++++++++
 .../skins/default/xui/en/menu_settings_gear.xml    |  57 +++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  16 +-
 .../newview/skins/default/xui/en/notifications.xml |  10 ++
 4 files changed, 259 insertions(+), 8 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_my_environments.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_settings_gear.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
new file mode 100644
index 0000000000..74921e8b64
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+        positioning="cascading"
+        save_rect="true"
+        legacy_header_height="18"
+        can_resize="true"
+        height="465"
+        name="my_environments"
+        help_topic="my_environments"
+        title="MY ENVIRONMENTS"
+        background_visible="true"
+        label="Places"
+        layout="topleft"
+        min_height="350"
+        min_width="265"
+        width="313">
+    <layout_stack 
+            follows="all"
+            layout="topleft"
+            left="5"
+            top="20"
+            right="-5"
+            bottom="-5"
+            orientation="vertical">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="false"
+                user_resize="true"
+                tab_group="1"
+                height="24"
+                name="filter_panel"
+                label="Filters"
+                font="SansSerifBold">
+            <icon
+                    height="16"
+                    image_name="Inv_SettingsDay"
+                    layout="topleft"
+                    mouse_opaque="true"
+                    name="icon_settingsdays"
+                    left="4"
+                    width="16" />
+            <check_box
+                    height="16"
+                    label="Days"
+                    layout="topleft"
+                    left_pad="2"
+                    name="chk_days"
+                    top_delta="0"
+                    width="60" />
+            <icon
+                    height="16"
+                    image_name="Inv_SettingsSky"
+                    layout="topleft"
+                    mouse_opaque="true"
+                    name="icon_settingsskies"
+                    left_pad="10"
+                    width="16" />
+            <check_box
+                    height="16"
+                    label="Skies"
+                    layout="topleft"
+                    left_pad="2"
+                    name="chk_skies"
+                    top_delta="0"
+                    width="60" />
+            <icon
+                    height="16"
+                    image_name="Inv_SettingsWater"
+                    layout="topleft"
+                    mouse_opaque="true"
+                    name="icon_settingswater"
+                    left_pad="10"
+                    width="16" />
+            <check_box
+                    height="16"
+                    label="Water"
+                    layout="topleft"
+                    left_pad="2"
+                    name="chk_water"
+                    top_delta="0"
+                    width="60" />
+        </layout_panel>
+        <layout_panel
+                auto_resize="true"
+                user_resize="true"
+                tab_group="1"
+                name="list_panel"
+                label="Environments"
+                font="SansSerifBold">
+            <inventory_panel
+                    allow_multi_select="false"
+                    bg_visible="true"
+                    bg_alpha_color="DkGray2"
+                    border="true"
+                    follows="left|top|right|bottom"
+                    left="2"
+                    name="pnl_settings"
+                    top="2"
+                    right="-2"
+                    bottom="-36" /> 
+            <check_box
+                    follows="left|bottom"
+                    height="14"
+                    initial_value="false"
+                    label="Show Empty Folders"
+                    layout="topleft"
+                    name="chk_showfolders"
+                    top="-20"
+                    top_pad="0"
+                    left_delta="-3"
+                    width="200" />
+                
+        </layout_panel>
+        <layout_panel
+                auto_resize="false"
+                user_resize="true"
+                tab_group="1"
+                height="62"
+                name="pnl_control"
+                font="SansSerifBold">
+            <panel
+                    background_visible="true"
+                    bevel_style="none"
+                    top_pad="0"
+                    follows="top|left|right"
+                    height="30"
+                    label="bottom_panel"
+                    layout="topleft"
+                    left="0"
+                    name="pnl_bottom">
+                <menu_button
+                        follows="bottom|left"
+                        height="18"
+                        image_disabled="OptionsMenu_Disabled"
+                        image_selected="OptionsMenu_Press"
+                        image_unselected="OptionsMenu_Off"
+                        layout="topleft"
+                        left="10"
+                        menu_filename="menu_settings_gear.xml"
+                        name="btn_gear"
+                        top="5"
+                        tool_tip="More options"
+                        width="18" />
+                <button
+                        follows="bottom|left"
+                        font="SansSerifBigBold"
+                        height="18"
+                        image_selected="AddItem_Press"
+                        image_unselected="AddItem_Off"
+                        image_disabled="AddItem_Disabled"
+                        layout="topleft"
+                        left_pad="5"
+                        name="btn_newsettings"
+                        tool_tip="Make new gesture"
+                        top_delta="0"
+                        width="18" />
+                <button
+                        follows="bottom|right"
+                        font="SansSerifBigBold"
+                        height="18"
+                        image_selected="TrashItem_Press"
+                        image_unselected="TrashItem_Off"
+                        image_disabled="TrashItem_Disabled"
+                        layout="topleft"
+                        name="btn_del"
+                        right="-5"
+                        tool_tip="Delete this gesture"
+                        top_delta="0"
+                        width="18" />
+            </panel>
+            <button
+                    follows="top|left"
+                    height="23"
+                    label="Edit"
+                    layout="topleft"
+                    left="6"
+                    name="btn_edit"
+                    top_pad="5"
+                    width="83" />
+
+        </layout_panel>
+    </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_settings_gear.xml b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
new file mode 100644
index 0000000000..73fae4f693
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_settings_gear.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ mouse_opaque="false"
+ name="menu_settings_gear"
+ visible="false">
+    <menu_item_call
+     label="Apply Selected Setting to Myself"
+     layout="topleft"
+     name="activate">
+        <on_click
+         function="Gesture.Action.ToogleActiveState" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="copy_settings">
+        <on_click
+         function="Gesture.Action.CopyPaste"
+         parameter="copy_gesture" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="copy_gesture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="paste_settings">
+        <on_click
+         function="Gesture.Action.CopyPaste"
+         parameter="paste" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy UUID"
+     layout="topleft"
+     name="copy_uuid">
+        <on_click
+         function="Gesture.Action.CopyPaste"
+         parameter="copy_uuid" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="copy_uuid" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="edit_settings">
+        <on_click
+         function="Gesture.Action.ShowPreview" />
+        <on_enable
+         function="Gesture.EnableAction"
+         parameter="edit_settings" />
+    </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b7a6cb9287..fe3f52ebcb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -695,23 +695,23 @@
                  parameter="region" />
             </menu_item_check>
             <menu_item_separator/>
-            <menu_item
+            <menu_item_call
              label="My Environments..."
-             name="My Environments">
-                <menu_item_check.on_click
-                 function="World.MyEnvirons"
+             name="my_environs">
+                <menu_item_call.on_click
+                 function="World.EnvSettings"
                  parameter="my_environs" />
-            </menu_item>
+            </menu_item_call>
             <menu_item_separator/>
             <menu_item_check
              label="Pause Clouds"
-             name="pauseclouds">
+             name="pause_clouds">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
-                 parameter="pauseclouds" />
+                 parameter="pause_clouds" />
                 <menu_item_check.on_check
                  function="World.EnableEnvSettings" 
-                 parameter="pauseclouds" />
+                 parameter="pause_clouds" />
             </menu_item_check>
             
         </menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index eb4f658495..6473ec9bc3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11140,5 +11140,15 @@ This Region does not support environmental settings.
 Unable to import legacy Windlight settings from [FILE].
   <tag>fail</tag>
   </notification>
+
+  <notification
+   icon="notify.tga"
+   name="WLParcelApplyFail"
+   persist="true"
+   type="alertmodal">
+Unable to set the environment for this parcel.
+Please enter or select a parcel that you have rights to modify.
+  <tag>fail</tag>
+  </notification>
   
 </notifications>
-- 
cgit v1.2.3