3 files changed, 138 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_slapp.xml b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
new file mode 100644
index 0000000000..dd2720816a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ legacy_header_height="18"
+ height="300"
+ layout="topleft"
+ name="slapp_test"
+ title="SLAPP TEST"
+ width="500">
+   <floater.string
+    name="remove_folder_slapp">
+    secondlife://app/remove_folder/?folder_id=
+   </floater.string>
+   <text
+    type="string"
+    length="1"
+    top="20"
+    follows="left|top|right"
+    height="16"
+    name="trusted_txt"
+    font="SansSerifMedium"
+    text_color="white"
+    layout="topleft"
+    left="16">
+        Trusted source
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="8"
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    /wear_folder
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    layout="topleft"
+    left="16">
+        secondlife://app/wear_folder/?folder_name=Daisy
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="8  "
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    /add_folder
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    layout="topleft"
+    left="16">
+        secondlife://app/add_folder/?folder_name=Cardboard%20Boxbot
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    layout="topleft">
+        secondlife://app/add_folder/?folder_id=59219db2-c260-87d3-213d-bb3bc298a3d8
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="8  "
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    /remove_folder
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    Folder ID:
+   </text>
+   <line_editor
+    border_style="line"
+    border_thickness="1"
+    follows="left|top"
+    font="SansSerif"
+    height="18"
+    layout="topleft"
+    left="75"
+    max_length_bytes="50"
+    prevalidate_callback="ascii"
+    name="remove_folder_id"
+    top_delta="-2"
+    width="270" />
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    name="remove_folder_txt"
+    layout="topleft"
+    left="16">
+        secondlife://app/remove_folder/?folder_id=
+   </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index d8aac71dd5..e57e3b0750 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -371,6 +371,14 @@
          parameter="copy_uuid" />
     </menu_item_call>
     <menu_item_call
+     label="Copy UUID"
+     layout="topleft"
+     name="Copy UUID">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy_folder_uuid" />
+    </menu_item_call>
+    <menu_item_call
      label="Show in Main Panel"
      layout="topleft"
      name="Show in Main Panel">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6fb92f7b99..343f0c0059 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3889,6 +3889,13 @@ function="World.EnvPreset"
                  function="Floater.Show"
                  parameter="font_test" />
             </menu_item_call>
+            <menu_item_call
+             label="Show SLapps Test"
+             name="Show SLapps Test">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="slapp_test" />
+            </menu_item_call>
             <menu_item_check
              label="Show XUI Names"
              name="Show XUI Names">