Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tiny patch for Issue 1385: Use normal folders for outfits while still creating links for everything

Browse Source 
Adds debug setting LiruLegacyOutfitAllLinks which overrides legacy outfit settings and forces the resulting folder to consist of only links
This commit is contained in:
Inusaito Sayori
2014-02-09 14:42:19 -05:00
parent 8f7e96e2a5
commit 77848afc94
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@@ -735,6 +735,17 @@
<key>Value</key>
<boolean>1</boolean>
</map>
<key>LiruLegacyOutfitAllLinks</key>
<map>
<key>Comment</key>
<string>Legacy outfits in clothing folder, completely made of links.. no other settings will apply for legacy outfits as they'll all be links.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>0</boolean>
</map>
<key>LiruLegacyOutfitStoreObjChanges</key>
<map>
<key>Comment</key>

13
indra/newview/llappearancemgr.cpp
View File

@@ -3732,6 +3732,9 @@ public:
*/
LLAppearanceMgr::instance().changeOutfit(true, mFolderID, false);
}
void setFailed() { mFailed = true; } // Singu Note: Lies and hacks
private:
class LLCreateBase : public LLInventoryCallback
{
@@ -3920,12 +3923,18 @@ LLUUID LLAppearanceMgr::makeNewOutfitLegacy(const std::string& new_folder_name,
LLPointer<LLCreateLegacyOutfit> cb = new LLCreateLegacyOutfit(folder_id,boost::bind(&scroll_to_folder,folder_id),boost::bind(&show_created_outfit,folder_id,true));
uuid_vec_t obj_ids; // Collect the uuids of copyable objects, in order to keep any changes made in the copies
bool use_all_links(gSavedSettings.getBOOL("LiruLegacyOutfitAllLinks"));
for (LLInventoryModel::item_array_t::const_iterator iter = items.begin();
iter != items.end();
++iter)
{
LLViewerInventoryItem* item = (*iter);
if (use_all_links)
{
cb->makeLink(item, item->LLInventoryItem::getDescription());
continue;
}
LLViewerInventoryItem* base_item = item->getLinkedItem() ? item->getLinkedItem() : item;
bool is_copy = base_item->getPermissions().allowCopyBy(gAgent.getID());
bool is_obj = base_item->getInventoryType() == LLInventoryType::IT_OBJECT;
@@ -3944,10 +3953,12 @@ LLUUID LLAppearanceMgr::makeNewOutfitLegacy(const std::string& new_folder_name,
cb->makeCopy(item,is_multi && use_links);
}
}
if (gSavedSettings.getBOOL("LiruLegacyOutfitStoreObjChanges")) // As a last resort, someone may create a legacy outfit to undo attachment changes
if (!use_all_links && gSavedSettings.getBOOL("LiruLegacyOutfitStoreObjChanges")) // As a last resort, someone may create a legacy outfit to undo attachment changes
LLAppearanceMgr::instance().removeItemsFromAvatar(obj_ids); // The avatar will have to go without these for now
cb->dispatch();
if (use_all_links) cb->setFailed(); // Cause an early return to avoid rewearing
return folder_id;
}