Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559

8 files changed, 482 insertions, 277 deletions

diff --git a/indra/newview/lldrawpoolpbropaque.cpp b/indra/newview/lldrawpoolpbropaque.cpp
index 0c257a33a5..b0f1867e9a 100644
--- a/indra/newview/lldrawpoolpbropaque.cpp
+++ b/indra/newview/lldrawpoolpbropaque.cpp
@@ -116,7 +116,7 @@ void LLDrawPoolPBROpaque::renderDeferred(S32 pass)
         }
         else
         {
-            // TODO: bind default normal map (???? WTF is it ???)
+            // TODO: bind default normal map (???? WTF is it ??? )
         }
 
         if (params.mSpecularMap)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a296d2dfef..cd6f631ee1 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -785,7 +785,10 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 	if (obj)
 	{
 		
-		items.push_back(std::string("Copy Separator"));
+		if (obj->getType() != LLInventoryType::IT_CATEGORY)
+		{
+			items.push_back(std::string("Copy Separator"));
+		}
 		items.push_back(std::string("Copy"));
 		if (!isItemCopyable())
 		{
@@ -878,7 +881,10 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 		}
 	}
 
-	items.push_back(std::string("Paste Separator"));
+	if (obj->getType() != LLInventoryType::IT_CATEGORY)
+	{
+		items.push_back(std::string("Paste Separator"));
+	}
 
 	addDeleteContextMenuOptions(items, disabled_items);
 
@@ -1420,6 +1426,14 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
             new_listener = new LLSettingsBridge(inventory, root, uuid, LLSettingsType::fromInventoryFlags(flags));
             break;
 
+        case LLAssetType::AT_MATERIAL:
+            if (inv_type != LLInventoryType::IT_MATERIAL)
+            {
+                LL_WARNS() << LLAssetType::lookup(asset_type) << " asset has inventory type " << LLInventoryType::lookupHumanReadable(inv_type) << " on uuid " << uuid << LL_ENDL;
+            }
+            new_listener = new LLMaterialBridge(inventory, root, uuid);
+            break;
+
 		default:
 			LL_INFOS_ONCE() << "Unhandled asset type (llassetstorage.h): "
 					<< (S32)asset_type << " (" << LLAssetType::lookup(asset_type) << ")" << LL_ENDL;
@@ -4094,10 +4108,12 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 			if (!isInboxFolder() // don't allow creation in inbox
 				&& outfits_id != mUUID)
 			{
+				bool menu_items_added = false;
 				// Do not allow to create 2-level subfolder in the Calling Card/Friends folder. EXT-694.
 				if (!LLFriendCardsManager::instance().isCategoryInFriendFolder(cat))
 				{
 					items.push_back(std::string("New Folder"));
+					menu_items_added = true;
 				}
                 if (!isMarketplaceListingsFolder())
                 {
@@ -4109,6 +4125,8 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
                     items.push_back(std::string("New Body Parts"));
                     items.push_back(std::string("New Settings"));
                     items.push_back(std::string("upload_def"));
+                    
+                    menu_items_added = true;
 
                     if (!LLEnvironment::instance().isInventoryEnabled())
                     {
@@ -4116,6 +4134,10 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
                     }
 
                 }
+                if (menu_items_added)
+                {
+                    items.push_back(std::string("Create Separator"));
+                }
 			}
 			getClipboardEntries(false, items, disabled_items, flags);
 		}
@@ -7201,6 +7223,39 @@ bool LLSettingsBridge::canUpdateRegion() const
 
 
 // +=================================================+
+// |        LLMaterialBridge                         |
+// +=================================================+
+
+void LLMaterialBridge::openItem()
+{
+    LLViewerInventoryItem* item = getItem();
+    if (item)
+    {
+        LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+    }
+}
+
+void LLMaterialBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
+{
+    LL_DEBUGS() << "LLMaterialBridge::buildContextMenu()" << LL_ENDL;
+
+    if (isMarketplaceListingsFolder())
+    {
+        menuentry_vec_t items;
+        menuentry_vec_t disabled_items;
+        addMarketplaceContextMenuOptions(flags, items, disabled_items);
+        items.push_back(std::string("Properties"));
+        getClipboardEntries(false, items, disabled_items, flags);
+        hide_context_entries(menu, items, disabled_items);
+    }
+    else
+    {
+        LLItemBridge::buildContextMenu(menu, flags);
+    }
+}
+
+
+// +=================================================+
 // |        LLLinkBridge                             |
 // +=================================================+
 // For broken folder links.
@@ -7587,6 +7642,25 @@ protected:
     LLSettingsBridgeAction(const LLUUID& id, LLInventoryModel* model) : LLInvFVBridgeAction(id, model) {}
 };
 
+class LLMaterialBridgeAction : public LLInvFVBridgeAction
+{
+    friend class LLInvFVBridgeAction;
+public:
+    void doIt() override
+    {
+        LLViewerInventoryItem* item = getItem();
+        if (item)
+        {
+            // TODO - show UI for material preview?
+            LL_INFOS() << "inventory action performed on material: " << item->getName() << " " << item->getUUID() << LL_ENDL;
+        }
+        LLInvFVBridgeAction::doIt();
+    }
+    ~LLMaterialBridgeAction() = default;
+private:
+    LLMaterialBridgeAction(const LLUUID& id,LLInventoryModel* model) : LLInvFVBridgeAction(id,model) {}
+};
+
 
 LLInvFVBridgeAction* LLInvFVBridgeAction::createAction(LLAssetType::EType asset_type,
 													   const LLUUID& uuid,
@@ -7629,6 +7703,9 @@ LLInvFVBridgeAction* LLInvFVBridgeAction::createAction(LLAssetType::EType asset_
         case LLAssetType::AT_SETTINGS:
             action = new LLSettingsBridgeAction(uuid, model);
             break;
+        case LLAssetType::AT_MATERIAL:
+            action = new LLMaterialBridgeAction(uuid, model);
+            break;
 		default:
 			break;
 	}
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 0b0ef273e1..6c1ddd716b 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -637,6 +637,17 @@ protected:
 
 };
 
+class LLMaterialBridge : public LLItemBridge
+{
+public:
+    LLMaterialBridge(LLInventoryPanel* inventory,
+                     LLFolderView* root,
+                     const LLUUID& uuid) :
+        LLItemBridge(inventory, root, uuid) {}
+    virtual void openItem();
+    virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
+};
+
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLInvFVBridgeAction
 //
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index e3206947d5..f1166fbc0d 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -28,14 +28,19 @@
 
 #include "llmaterialeditor.h"
 
+#include "llagent.h"
 #include "llappviewer.h"
 #include "llcombobox.h"
+#include "llinventorymodel.h"
 #include "llnotificationsutil.h"
 #include "lltexturectrl.h"
 #include "lltrans.h"
 #include "llviewermenufile.h"
 #include "llviewertexture.h"
+#include "llsdutil.h"
 #include "llselectmgr.h"
+#include "llviewerinventory.h"
+#include "llviewerregion.h"
 #include "llvovolume.h"
 
 #include "tinygltf/tiny_gltf.h"
@@ -67,7 +72,12 @@ BOOL LLMaterialEditor::postBuild()
     childSetAction("save_as", boost::bind(&LLMaterialEditor::onClickSaveAs, this));
     childSetAction("cancel", boost::bind(&LLMaterialEditor::onClickCancel, this));
 
-    boost::function<void(LLUICtrl*, void*)> changes_callback = [this](LLUICtrl * ctrl, void*) { setHasUnsavedChanges(true); };
+    boost::function<void(LLUICtrl*, void*)> changes_callback = [this](LLUICtrl * ctrl, void*)
+    {
+        setHasUnsavedChanges(true);
+        // Apply changes to object live
+        applyToSelection();
+    };
  
     childSetCommitCallback("double sided", changes_callback, NULL);
 
@@ -90,6 +100,10 @@ BOOL LLMaterialEditor::postBuild()
 
     childSetVisible("unsaved_changes", mHasUnsavedChanges);
 
+    // Todo:
+    // Disable/enable setCanApplyImmediately() based on
+    // working from inventory, upload or editing inworld
+
 	return LLFloater::postBuild();
 }
 
@@ -289,6 +303,7 @@ void LLMaterialEditor::onCommitAlbedoTexture(LLUICtrl * ctrl, const LLSD & data)
         childSetValue("albedo_upload_fee", getString("no_upload_fee_string"));
     }
     setHasUnsavedChanges(true);
+    applyToSelection();
 }
 
 void LLMaterialEditor::onCommitMetallicTexture(LLUICtrl * ctrl, const LLSD & data)
@@ -303,6 +318,7 @@ void LLMaterialEditor::onCommitMetallicTexture(LLUICtrl * ctrl, const LLSD & dat
         childSetValue("metallic_upload_fee", getString("no_upload_fee_string"));
     }
     setHasUnsavedChanges(true);
+    applyToSelection();
 }
 
 void LLMaterialEditor::onCommitEmissiveTexture(LLUICtrl * ctrl, const LLSD & data)
@@ -317,6 +333,7 @@ void LLMaterialEditor::onCommitEmissiveTexture(LLUICtrl * ctrl, const LLSD & dat
         childSetValue("emissive_upload_fee", getString("no_upload_fee_string"));
     }
     setHasUnsavedChanges(true);
+    applyToSelection();
 }
 
 void LLMaterialEditor::onCommitNormalTexture(LLUICtrl * ctrl, const LLSD & data)
@@ -331,6 +348,7 @@ void LLMaterialEditor::onCommitNormalTexture(LLUICtrl * ctrl, const LLSD & data)
         childSetValue("normal_upload_fee", getString("no_upload_fee_string"));
     }
     setHasUnsavedChanges(true);
+    applyToSelection();
 }
 
 
@@ -428,6 +446,43 @@ void LLMaterialEditor::onClickSave()
     std::string dump = str.str();
 
     LL_INFOS() << mMaterialName << ": " << dump << LL_ENDL;
+
+    // gen a new uuid for this asset
+    LLTransactionID tid;
+    tid.generate();     // timestamp-based randomization + uniquification
+    LLAssetID new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
+    std::string res_desc = "Saved Material";
+    U32 next_owner_perm = LLPermissions::DEFAULT.getMaskNextOwner();
+    LLUUID parent = gInventory.findCategoryUUIDForType(LLFolderType::FT_MATERIAL);
+    const U8 subtype = NO_INV_SUBTYPE;  // TODO maybe use AT_SETTINGS and LLSettingsType::ST_MATERIAL ?
+
+    create_inventory_item(gAgent.getID(), gAgent.getSessionID(), parent, tid, mMaterialName, res_desc,
+        LLAssetType::AT_MATERIAL, LLInventoryType::IT_MATERIAL, subtype, next_owner_perm,
+        new LLBoostFuncInventoryCallback([output=dump](LLUUID const & inv_item_id){
+            // from reference in LLSettingsVOBase::createInventoryItem()/updateInventoryItem()
+            LLResourceUploadInfo::ptr_t uploadInfo =
+                std::make_shared<LLBufferedAssetUploadInfo>(
+                    inv_item_id,
+                    LLAssetType::AT_SETTINGS, // TODO switch to AT_MATERIAL
+                    output,
+                    [](LLUUID item_id, LLUUID new_asset_id, LLUUID new_item_id, LLSD response) {
+                        LL_INFOS("Material") << "inventory item uploaded.  item: " << item_id << " asset: " << new_asset_id << " new_item_id: " << new_item_id << " response: " << response << LL_ENDL;
+                        LLSD params = llsd::map("ASSET_ID", new_asset_id);
+                        LLNotificationsUtil::add("MaterialCreated", params);
+                    });
+
+            const LLViewerRegion* region = gAgent.getRegion();
+            if (region)
+            {
+                 std::string agent_url(region->getCapability("UpdateSettingsAgentInventory"));
+                 if (agent_url.empty())
+                 {
+                     LL_ERRS() << "missing required agent inventory cap url" << LL_ENDL;
+                 }
+                 LLViewerAssetUpload::EnqueueInventoryUpload(agent_url, uploadInfo);
+            }
+        })
+    );
 }
 
 void LLMaterialEditor::onClickSaveAs()
@@ -778,6 +833,10 @@ void LLMaterialEditor::importMaterial()
 
 void LLMaterialEditor::applyToSelection()
 {
+    // Todo: associate with a specific 'selection' instead
+    // of modifying something that is selected
+    // This should be disabled when working from agent's
+    // inventory and for initial upload
     LLViewerObject* objectp = LLSelectMgr::instance().getSelection()->getFirstObject();
     if (objectp && objectp->getVolume())
     {
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 0d987df6ca..defd7025b8 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1151,6 +1151,56 @@ LLSettingsType::type_e LLTaskSettingsBridge::getSettingsType() const
 }
 
 ///----------------------------------------------------------------------------
+/// Class LLTaskMaterialBridge
+///----------------------------------------------------------------------------
+
+class LLTaskMaterialBridge : public LLTaskInvFVBridge
+{
+public:
+    LLTaskMaterialBridge(LLPanelObjectInventory* panel,
+                         const LLUUID& uuid,
+                         const std::string& name) :
+        LLTaskInvFVBridge(panel, uuid, name) {}
+
+    BOOL canOpenItem() const override { return TRUE; }
+    void openItem() override;
+    BOOL removeItem() override;
+};
+
+void LLTaskMaterialBridge::openItem()
+{
+    LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+    if(!object || object->isInventoryPending())
+    {
+        return;
+    }
+
+    // Note: even if we are not allowed to modify copyable notecard, we should be able to view it
+    LLInventoryItem *item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mUUID));
+    BOOL item_copy = item && gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE);
+    if( item_copy
+        || object->permModify()
+        || gAgent.isGodlike())
+    {
+        LLSD floater_key;
+        floater_key["taskid"] = mPanel->getTaskUUID();
+        floater_key["itemid"] = mUUID;
+        LLPreviewNotecard* preview = LLFloaterReg::showTypedInstance<LLPreviewNotecard>("preview_notecard", floater_key, TAKE_FOCUS_YES);
+        if (preview)
+        {
+            preview->setObjectID(mPanel->getTaskUUID());
+        }
+    }
+}
+
+BOOL LLTaskMaterialBridge::removeItem()
+{
+    LLFloaterReg::hideInstance("preview_notecard", LLSD(mUUID));
+    return LLTaskInvFVBridge::removeItem();
+}
+
+
+///----------------------------------------------------------------------------
 /// LLTaskInvFVBridge impl
 //----------------------------------------------------------------------------
 
@@ -1237,6 +1287,11 @@ LLTaskInvFVBridge* LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory*
 										  object_name,
                                           itemflags);
 		break;
+    case LLAssetType::AT_MATERIAL:
+        new_bridge = new LLTaskMaterialBridge(panel,
+                              object_id,
+                              object_name);
+        break;
 	default:
 		LL_INFOS() << "Unhandled inventory type (llassetstorage.h): "
 				<< (S32)type << LL_ENDL;
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index b761f34790..ee83d9eb57 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -121,8 +121,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mOnUpdateImageStatsCallback(NULL),
 	mBakeTextureEnabled(FALSE)
 {
-	buildFromFile("floater_texture_ctrl.xml");
 	mCanApplyImmediately = can_apply_immediately;
+	buildFromFile("floater_texture_ctrl.xml");
 	setCanMinimize(FALSE);
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml
index 36315d3b04..df06896fa5 100644
--- a/indra/newview/skins/default/xui/en/floater_material_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml
@@ -43,7 +43,7 @@
     Albedo:
   </text>
     <texture_picker
-             can_apply_immediately="false"
+             can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
              allow_no_texture="true"
@@ -81,7 +81,7 @@
     Tint
   </text>
   <color_swatch
-                    can_apply_immediately="false"
+                    can_apply_immediately="true"
                     follows="left|top"
                     height="40"
                     label_height="0"
@@ -198,7 +198,7 @@
     Metallic-Roughness:
   </text>
     <texture_picker
-             can_apply_immediately="false"
+             can_apply_immediately="true"
              default_image_name="Default"
              fallback_image="materials_ui_x_24.png"
              allow_no_texture="true"
@@ -299,7 +299,7 @@
       Emissive:
     </text>
     <texture_picker
-               can_apply_immediately="false"
+               can_apply_immediately="true"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
                allow_no_texture="true"
@@ -336,7 +336,7 @@
       Tint
     </text>
     <color_swatch
-                      can_apply_immediately="false"
+                      can_apply_immediately="true"
                       follows="left|top"
                       height="40"
                       label_height="0"
@@ -394,7 +394,7 @@
       Normal:
     </text>
     <texture_picker
-               can_apply_immediately="false"
+               can_apply_immediately="true"
                default_image_name="Default"
                fallback_image="materials_ui_x_24.png"
                allow_no_texture="true"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 60a177f0bd..67bcbe020b 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -143,272 +143,6 @@
          function="Inventory.EmptyLostAndFound"
          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">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="outfit" />
-    </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>
-    <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
-     label="Use as default for"
-     layout="topleft"
-     name="upload_def">
-      <menu_item_call
-       label="Image uploads"
-       layout="topleft"
-       name="Image uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="texture" />
-      </menu_item_call>
-      <menu_item_call
-       label="Sound uploads"
-       layout="topleft"
-       name="Sound uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="sound" />
-      </menu_item_call>
-      <menu_item_call
-       label="Animation uploads"
-       layout="topleft"
-       name="Animation uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="animation" />
-      </menu_item_call>
-      <menu_item_call
-       label="Model uploads"
-       layout="topleft"
-       name="Model uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="model" />
-      </menu_item_call>
-    </menu>
     <menu
      label="Change Type"
      layout="topleft"
@@ -691,6 +425,275 @@
          parameter="delete_system_folder" />
     </menu_item_call>
     <menu_item_separator
+     layout="topleft"
+     name="Create Separator" />
+    <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">
+      <menu_item_call.on_click
+       function="Inventory.DoCreate"
+       parameter="outfit" />
+    </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>
+    <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
+     label="Use as default for"
+     layout="topleft"
+     name="upload_def">
+      <menu_item_call
+       label="Image uploads"
+       layout="topleft"
+       name="Image uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="texture" />
+      </menu_item_call>
+      <menu_item_call
+       label="Sound uploads"
+       layout="topleft"
+       name="Sound uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="sound" />
+      </menu_item_call>
+      <menu_item_call
+       label="Animation uploads"
+       layout="topleft"
+       name="Animation uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="animation" />
+      </menu_item_call>
+      <menu_item_call
+       label="Model uploads"
+       layout="topleft"
+       name="Model uploads">
+        <menu_item_call.on_click
+         function="Inventory.FileUploadLocation"
+         parameter="model" />
+      </menu_item_call>
+    </menu>
+    <menu_item_separator
      layout="topleft" />
     <menu_item_separator
      layout="topleft" />