Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

1 files changed, 228 insertions, 8 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 1907dc2438..3a8f360e2d 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -144,14 +144,6 @@
          parameter="rename" />
     </menu_item_call>
     <menu_item_call
-     label="New Folder"
-     layout="topleft"
-     name="New Folder">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="category" />
-    </menu_item_call>
-    <menu_item_call
      label="New Outfit"
      layout="topleft"
      name="New Outfit">
@@ -699,6 +691,234 @@
   <menu_item_separator
    layout="topleft"
    name="Subfolder Separator" />
+  <menu
+   label="Create new"
+   layout="topleft"
+   name="create_new">
+    <menu_item_call
+     label="New Folder"
+     layout="topleft"
+     name="New Folder">
+      <menu_item_call.on_click
+       function="Inventory.DoCreate"
+       parameter="category" />
+    </menu_item_call>
+    <menu_item_call
+     label="New Script"
+     layout="topleft"
+     name="New Script">
+      <menu_item_call.on_click
+       function="Inventory.DoCreate"
+       parameter="lsl" />
+    </menu_item_call>
+    <menu_item_call
+     label="New Notecard"
+     layout="topleft"
+     name="New Note">
+      <menu_item_call.on_click
+       function="Inventory.DoCreate"
+       parameter="notecard" />
+    </menu_item_call>
+    <menu_item_call
+     label="New Gesture"
+     layout="topleft"
+     name="New Gesture">
+      <menu_item_call.on_click
+       function="Inventory.DoCreate"
+       parameter="gesture" />
+    </menu_item_call>
+    <menu_item_call
+     label="New Material"
+     layout="topleft"
+     name="New Material">
+      <menu_item_call.on_click
+       function="Inventory.DoCreate"
+       parameter="material" />
+      <menu_item_call.on_enable
+       function="Inventory.MaterialsEnabled" />
+    </menu_item_call>
+    <menu
+     label="New Clothes"
+     layout="topleft"
+     name="New Clothes">
+      <menu_item_call
+       label="New Shirt"
+       layout="topleft"
+       name="New Shirt">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="shirt" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Pants"
+       layout="topleft"
+       name="New Pants">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="pants" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Shoes"
+       layout="topleft"
+       name="New Shoes">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="shoes" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Socks"
+       layout="topleft"
+       name="New Socks">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="socks" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Jacket"
+       layout="topleft"
+       name="New Jacket">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="jacket" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Skirt"
+       layout="topleft"
+       name="New Skirt">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="skirt" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Gloves"
+       layout="topleft"
+       name="New Gloves">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="gloves" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Undershirt"
+       layout="topleft"
+       name="New Undershirt">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="undershirt" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Underpants"
+       layout="topleft"
+       name="New Underpants">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="underpants" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Alpha Mask"
+       layout="topleft"
+       name="New Alpha Mask">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="alpha" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Tattoo"
+       layout="topleft"
+       name="New Tattoo">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="tattoo" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Universal"
+       layout="topleft"
+       name="New Universal">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="universal" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Physics"
+       layout="topleft"
+       name="New Physics">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="physics" />
+      </menu_item_call>
+    </menu>
+    <menu
+     label="New Body Parts"
+     layout="topleft"
+     name="New Body Parts">
+      <menu_item_call
+       label="New Shape"
+       layout="topleft"
+       name="New Shape">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="shape" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Skin"
+       layout="topleft"
+       name="New Skin">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="skin" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Hair"
+       layout="topleft"
+       name="New Hair">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="hair" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Eyes"
+       layout="topleft"
+       name="New Eyes">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="eyes" />
+      </menu_item_call>
+    </menu>
+    <menu
+     label="New Settings"
+     layout="topleft"
+     name="New Settings">
+      <menu_item_call
+       label="New Sky"
+       layout="topleft"
+       name="New Sky">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="sky"/>
+        <menu_item_call.on_enable
+         function="Inventory.EnvironmentEnabled" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Water"
+       layout="topleft"
+       name="New Water">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="water"/>
+        <menu_item_call.on_enable
+         function="Inventory.EnvironmentEnabled" />
+      </menu_item_call>
+      <menu_item_call
+       label="New Day Cycle"
+       layout="topleft"
+       name="New Day Cycle">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="daycycle"/>
+        <menu_item_call.on_enable
+         function="Inventory.EnvironmentEnabled" />
+      </menu_item_call>
+    </menu>
+  </menu>  
   <menu_item_call
    label="Create folder from selected"
    layout="topleft"