From e2c74d8fabaa369b4d368deb5b8d54235505dd87 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 22 Aug 2010 18:45:14 +0200 Subject: [PATCH 1/6] - review : removed (non-functional) code relating to RLVaCreateFoldersOnSaveOutfit -> SL-2.1 sidebar outfit panel no longer supports child folders in outfit folders -> RLVa-1.2.1 will remove the need to specify attachment point names in shared folders --HG-- branch : RLVa --- indra/newview/app_settings/settings.xml | 11 ---- indra/newview/llappearancemgr.cpp | 62 +++---------------- indra/newview/llappearancemgr.h | 6 +- indra/newview/rlvdefines.h | 1 - .../default/xui/en/floater_outfit_save_as.xml | 15 +---- 5 files changed, 12 insertions(+), 83 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index aafd0dabe1..490215ca3f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -45,17 +45,6 @@ Value 1 - RLVaCreateFoldersOnSaveOutfit - - Comment - Automatically create ".(<attachpt>>)" folders when saving an outfit" - Persist - 1 - Type - Boolean - Value - 0 - RLVaDebugUIEnablers Comment diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 8a81242c9a..7f200a72d5 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1182,12 +1182,8 @@ void LLAppearanceMgr::shallowCopyCategory(const LLUUID& src_id, const LLUUID& ds } // Copy contents of src_id to dst_id. -//void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, -// LLPointer cb) -// [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.0f) | Added: RLVa-1.2.0f void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, - LLPointer cb, bool fRlvCreateFolders) -// [/RLVa:KB] + LLPointer cb) { LLInventoryModel::cat_array_t* cats; LLInventoryModel::item_array_t* items; @@ -1202,54 +1198,14 @@ void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LL { case LLAssetType::AT_LINK: { -// [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.0f) | Added: RLVa-1.2.0f - const LLViewerInventoryItem* pItemTarget = item->getLinkedItem(); - if ( (rlv_handler_t::isEnabled()) && (fRlvCreateFolders) && (pItemTarget) ) - { - switch (pItemTarget->getType()) - { - case LLAssetType::AT_OBJECT: - { - // Attachments fall through to default unless they're currently worn in which case we need to stuff them - // into their own .() folder (unless the target already specifies an attachment point name) - if ( (isAgentAvatarValid()) && (!RlvAttachPtLookup::hasAttachPointName(pItemTarget)) ) - { - std::string strAttachPt = gAgentAvatarp->getAttachedPointName(pItemTarget->getUUID()); - if (!strAttachPt.empty()) - { - LLStringUtil::toLower(strAttachPt); - LLUUID idAttachPtFolder = gInventory.createNewCategory( - dst_id, LLFolderType::FT_NONE, llformat(".(%s)", strAttachPt.c_str())); - //LLInventoryItem::getDescription() is used for a new description - //to propagate ordering information saved in descriptions of links - link_inventory_item(gAgent.getID(), pItemTarget->getUUID(), idAttachPtFolder, - pItemTarget->getName(), pItemTarget->LLInventoryItem::getDescription(), LLAssetType::AT_LINK, cb); - break; - } - } - } - default: - //LLInventoryItem::getDescription() is used for a new description - //to propagate ordering information saved in descriptions of links - link_inventory_item(gAgent.getID(), item->getLinkedUUID(), dst_id, item->getName(), - item->LLInventoryItem::getDescription(), LLAssetType::AT_LINK, cb); - break; - } - } - else - { -// [/RLVa:KB] - //LLInventoryItem::getDescription() is used for a new description - //to propagate ordering information saved in descriptions of links - link_inventory_item(gAgent.getID(), - item->getLinkedUUID(), - dst_id, - item->getName(), - item->LLInventoryItem::getDescription(), - LLAssetType::AT_LINK, cb); -// [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.0e) | Added: 2010-04-20 - } -// [/RLVa:KB] + //LLInventoryItem::getDescription() is used for a new description + //to propagate ordering information saved in descriptions of links + link_inventory_item(gAgent.getID(), + item->getLinkedUUID(), + dst_id, + item->getName(), + item->LLInventoryItem::getDescription(), + LLAssetType::AT_LINK, cb); break; } case LLAssetType::AT_LINK_FOLDER: diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 10d215ff1e..734373503a 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -87,12 +87,8 @@ public: bool getCanReplaceCOF(const LLUUID& outfit_cat_id); // Copy all items in a category. -// void shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, -// LLPointer cb); -// [RLVa:KB] - Checked: 2010-04-20 (RLVa-1.2.0f) | Added: RLVa-1.2.0f void shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, - LLPointer cb, bool fRlvCreateFolders = false); -// [/RLVa:KB] + LLPointer cb); // Find the Current Outfit folder. const LLUUID getCOF() const; diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h index 01286071b1..973239d205 100644 --- a/indra/newview/rlvdefines.h +++ b/indra/newview/rlvdefines.h @@ -279,7 +279,6 @@ enum ERlvAttachGroupType #define RLV_SETTING_NOSETENV "RestrainedLoveNoSetEnv" #define RLV_SETTING_FORBIDGIVETORLV "RestrainedLoveForbidGiveToRLV" -#define RLV_SETTING_CREATEOUTFITFOLDERS "RLVaCreateFoldersOnSaveOutfit" #define RLV_SETTING_DEBUGUIENABLERS "RLVaDebugUIEnablers" #define RLV_SETTING_ENABLECOMPOSITES "RLVaEnableCompositeFolders" #define RLV_SETTING_ENABLELEGACYNAMING "RLVaEnableLegacyNaming" diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml index c19d24370a..1d73d516d0 100644 --- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml @@ -2,7 +2,7 @@