diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index cd15035774..5567a55cfa 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2812,12 +2812,6 @@ void LLAppearanceMgr::getUserDescendents(const LLUUID& category,
}
void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append)
-// ReplaceWornItemsOnly
-{
- wearInventoryCategory(category, copy, append, false);
-}
-void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool replace)
-//
{
if(!category) return;
@@ -2853,33 +2847,15 @@ void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool
callAfterCategoryFetch(category->getUUID(),boost::bind(&LLAppearanceMgr::wearCategoryFinal,
&LLAppearanceMgr::instance(),
category->getUUID(), copy, append));
-// ReplaceWornItemsOnly
- //category->getUUID(), copy, append, replace));
-//
}
}
-// ReplaceWornItemsOnly
-void LLAppearanceMgr::replaceCategoryInCurrentOutfit(const LLUUID& cat_id)
-{
- LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
- wearInventoryCategory(cat, false, true);
-}
-//
-
S32 LLAppearanceMgr::getActiveCopyOperations() const
{
return LLCallAfterInventoryCopyMgr::getInstanceCount();
}
void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append)
-// ReplaceWornItemsOnly
-{
- wearCategoryFinal(cat_id, copy_items, append, false);
-}
-
-void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool replace)
-//
{
LL_INFOS("Avatar") << self_av_string() << "starting" << LL_ENDL;
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 744507da3d..52a0bf6751 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -62,15 +62,8 @@ public:
bool append = false, const LLUUID& idOutfit = LLUUID::null, LLPointer link_waiter = NULL);
// [/RLVa:KB]
void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append);
-// ReplaceWornItemsOnly
- void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool items);
-//
void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append);
void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append);
-// ReplaceWornItemsOnly
- void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool items);
- void replaceCategoryInCurrentOutfit(const LLUUID& cat_id);
-//
void wearOutfitByName(const std::string& name);
void changeOutfit(bool proceed, const LLUUID& category, bool append);
void replaceCurrentOutfit(const LLUUID& new_outfit);
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 08540b879c..45d489ac5b 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3463,7 +3463,6 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
if(!cat) return;
gInventory.wearItemsOnAvatar(cat);
- // modifyOutfit(TRUE, TRUE);
return;
}
//
@@ -4677,13 +4676,6 @@ void LLFolderBridge::createWearable(LLFolderBridge* bridge, LLWearableType::ETyp
}
void LLFolderBridge::modifyOutfit(BOOL append)
-// Patch: ReplaceWornItemsOnly
-{
- modifyOutfit(append, false);
-}
-
-void LLFolderBridge::modifyOutfit(BOOL append, BOOL replace)
-//
{
LLInventoryModel* model = getInventoryModel();
if(!model) return;
@@ -4709,7 +4701,7 @@ void LLFolderBridge::modifyOutfit(BOOL append, BOOL replace)
return;
}
- LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, append, replace );
+ LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, append );
}
// +=================================================+
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index d5ac086ca9..efc921bbfa 100755
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -385,9 +385,6 @@ protected:
BOOL checkFolderForContentsOfType(LLInventoryModel* model, LLInventoryCollectFunctor& typeToCheck);
void modifyOutfit(BOOL append);
-// ReplaceWornItemsOnly
- void modifyOutfit(BOOL append, BOOL replace);
-//
void determineFolderType();
void dropToFavorites(LLInventoryItem* inv_item);
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 882f54b217..5f0c3ad270 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3941,8 +3941,7 @@ void LLInventoryModel::wearItemsOnAvatar(LLInventoryCategory* category)
return;
}
- LL_INFOS() << "ReplaceWornItemsOnly wear_inventory_category_on_avatar( "
- << category->getName() << " )" << LL_ENDL;
+ LL_INFOS() << "ReplaceWornItemsOnly wear_inventory_category_on_avatar( " << category->getName() << " )" << LL_ENDL;
LLUUID category_id = category->getUUID();
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 392b3801e1..b41c547efa 100755
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -123,9 +123,6 @@ public:
registrar.add("Gear.Expand", boost::bind(&LLOutfitsList::expand_all_folders, mOutfitList));
registrar.add("Gear.WearAdd", boost::bind(&LLOutfitListGearMenu::onAdd, this));
-//-TT Patch: ReplaceWornItemsOnly
- registrar.add("Gear.WearReplaceItems",boost::bind(&LLOutfitListGearMenu::onReplaceItems, this));
-//-TT
enable_registrar.add("Gear.OnEnable", boost::bind(&LLOutfitListGearMenu::onEnable, this, _2));
enable_registrar.add("Gear.OnVisible", boost::bind(&LLOutfitListGearMenu::onVisible, this, _2));
@@ -184,17 +181,6 @@ private:
}
}
-//-TT Patch: ReplaceWornItemsOnly
- void onReplaceItems()
- {
- const LLUUID& selected_id = getSelectedOutfitID();
-
- if (selected_id.notNull())
- {
- //LLAppearanceMgr::getInstance()->replaceCategoryInCurrentOutfit(selected_id);
- }
- }
-//-TT
void onTakeOff()
{
// Take off selected outfit.
@@ -285,10 +271,6 @@ protected:
boost::bind(&LLAppearanceMgr::replaceCurrentOutfit, &LLAppearanceMgr::instance(), selected_id));
registrar.add("Outfit.WearAdd",
boost::bind(&LLAppearanceMgr::addCategoryToCurrentOutfit, &LLAppearanceMgr::instance(), selected_id));
-//-TT Patch: ReplaceWornItemsOnly
- registrar.add("Outfit.WearReplaceItems",
- boost::bind(&LLAppearanceMgr::replaceCategoryInCurrentOutfit, &LLAppearanceMgr::instance(), selected_id));
-//-TT
registrar.add("Outfit.TakeOff",
boost::bind(&LLAppearanceMgr::takeOffOutfit, &LLAppearanceMgr::instance(), selected_id));
registrar.add("Outfit.Edit", boost::bind(editOutfit));