livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up lots of orphaned appearance-related code

meow-7.2.2
Ansariel 2016-01-23 13:06:47 +01:00
parent 147a56b766
commit acde280f9c
6 changed files with 2 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llappearancemgr.cpp
View File

@ -2812,12 +2812,6 @@ void LLAppearanceMgr::getUserDescendents(const LLUUID& category,
}
void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append)
// <FS:TT> ReplaceWornItemsOnly
{
wearInventoryCategory(category, copy, append, false);
}
void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool replace)
// </FS:TT>
{
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));
// <FS:TT> ReplaceWornItemsOnly
//category->getUUID(), copy, append, replace));
// <FS:TT>
}
}
// <FS:TT> ReplaceWornItemsOnly
void LLAppearanceMgr::replaceCategoryInCurrentOutfit(const LLUUID& cat_id)
{
LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
wearInventoryCategory(cat, false, true);
}
// </FS:TT>
S32 LLAppearanceMgr::getActiveCopyOperations() const
{
return LLCallAfterInventoryCopyMgr::getInstanceCount();
}
void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append)
// <FS:TT> ReplaceWornItemsOnly
{
wearCategoryFinal(cat_id, copy_items, append, false);
}
void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool replace)
// </FS:TT>
{
LL_INFOS("Avatar") << self_av_string() << "starting" << LL_ENDL;

7
indra/newview/llappearancemgr.h
View File

@ -62,15 +62,8 @@ public:
bool append = false, const LLUUID& idOutfit = LLUUID::null, LLPointer<LLInventoryCallback> link_waiter = NULL);
// [/RLVa:KB]
void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append);
// <FS:TT> ReplaceWornItemsOnly
void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool items);
// </FS:TT>
void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append);
void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append);
// <FS:TT> ReplaceWornItemsOnly
void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool items);
void replaceCategoryInCurrentOutfit(const LLUUID& cat_id);
// </FS:TT>
void wearOutfitByName(const std::string& name);
void changeOutfit(bool proceed, const LLUUID& category, bool append);
void replaceCurrentOutfit(const LLUUID& new_outfit);

10
indra/newview/llinventorybridge.cpp
View File

@ -3463,7 +3463,6 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
if(!cat) return;
gInventory.wearItemsOnAvatar(cat);
// modifyOutfit(TRUE, TRUE);
return;
}
// </FS:TT>
@ -4677,13 +4676,6 @@ void LLFolderBridge::createWearable(LLFolderBridge* bridge, LLWearableType::ETyp
}
void LLFolderBridge::modifyOutfit(BOOL append)
// <FS:TT> Patch: ReplaceWornItemsOnly
{
modifyOutfit(append, false);
}
void LLFolderBridge::modifyOutfit(BOOL append, BOOL replace)
// </FS:TT>
{
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 );
}
// +=================================================+

3
indra/newview/llinventorybridge.h
View File

@ -385,9 +385,6 @@ protected:
BOOL checkFolderForContentsOfType(LLInventoryModel* model, LLInventoryCollectFunctor& typeToCheck);
void modifyOutfit(BOOL append);
// <FS:TT> ReplaceWornItemsOnly
void modifyOutfit(BOOL append, BOOL replace);
// </FS:TT>
void determineFolderType();
void dropToFavorites(LLInventoryItem* inv_item);

3
indra/newview/llinventorymodel.cpp
View File

@ -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();

18
indra/newview/lloutfitslist.cpp
View File

@ -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));