diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index aafd0dabe15a76b39be5e92bc2a7529cd34993ba..490215ca3f92d88c522742aaa894dbc3a0f1c7a4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -45,17 +45,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>RLVaCreateFoldersOnSaveOutfit</key>
- <map>
- <key>Comment</key>
- <string>Automatically create ".(<attachpt>>)" folders when saving an outfit"</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>RLVaDebugUIEnablers</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 8a81242c9a778236ac6b635bd8a05d5ccb555058..7f200a72d5f12d254d21dcff8f16e390b6480ff9 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<LLInventoryCallback> 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<LLInventoryCallback> cb, bool fRlvCreateFolders)
-// [/RLVa:KB]
+ LLPointer<LLInventoryCallback> 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 .(<attachpt>) 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 10d215ff1e2898c0168898f487152169709b59d1..734373503ac4513a2bec27aaf034913c336d6500 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<LLInventoryCallback> 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<LLInventoryCallback> cb, bool fRlvCreateFolders = false);
-// [/RLVa:KB]
+ LLPointer<LLInventoryCallback> cb);
// Find the Current Outfit folder.
const LLUUID getCOF() const;
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index 01286071b1eac2f0b5fca44ffc383a566890d763..973239d205b73430cacb3c110116d56189e8b870 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 c19d24370a490491bab9848be324640c1d77b16f..1d73d516d0bc6508597f397216462d61e5d67249 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 @@
<floater
can_close="false"
can_minimize="false"
- height="125"
+ height="100"
layout="topleft"
title="Save Outfit"
name="modal container"
@@ -14,7 +14,7 @@
layout="topleft"
left="20"
name="Save"
- top="90"
+ top="70"
width="82" />
<button
height="23"
@@ -55,15 +55,4 @@ as a new Outfit:
width="200">
[DESC] (new)
</line_editor>
- <check_box
- visible="false"
- control_name="RLVaCreateFoldersOnSaveOutfit"
- height="16"
- label="#RLV compatible outfit"
- tool_tip="Creates attachment point folders"
- layout="topleft"
- left_delta="0"
- name="rlv_create_folders"
- top_pad="4"
- width="200" />
</floater>