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

MAINT-4001 : Make Received Items not movable (protected), consolidate Received Items folders which may have been moved

Browse Source 
Work by Merov Linden.
This commit is contained in:
Inusaito Sayori
2014-06-18 08:05:49 -04:00
parent e93fdf4615
commit 3656cb9fdb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llappviewer.cpp
View File

@@ -4708,6 +4708,12 @@ void LLAppViewer::handleLoginComplete()
}
mOnLoginCompleted();
// Singu Note: Due to MAINT-4001, we must do this here, it lives in LLSidepanelInventory::updateInbox upstream.
// Consolidate Received items
// We shouldn't have to do that but with a client/server system relying on a "well known folder" convention,
// things can get messy and conventions broken. This call puts everything back together in its right place.
LLUUID id(gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX, true));
if (id.notNull()) gInventory.consolidateForType(id, LLFolderType::FT_INBOX);
writeDebugInfo();
}

4
indra/newview/llviewerfoldertype.cpp
View File

@@ -132,8 +132,8 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
addEntry(LLFolderType::FT_MY_OUTFITS, new ViewerFolderEntry("My Outfits", "inv_folder_outfit.tga", "inv_folder_outfit.tga", TRUE, false));
addEntry(LLFolderType::FT_MESH, new ViewerFolderEntry("Meshes", "inv_folder_mesh.tga", "inv_folder_mesh.tga", FALSE, false));
addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "inv_folder_inbox.tga", "inv_folder_inbox.tga", FALSE, false));
addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Outbox", "inv_folder_outbox.tga", "inv_folder_outbox.tga", FALSE, false));
addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Received Items", "inv_folder_inbox.tga", "inv_folder_inbox.tga", FALSE, false));
addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Merchant Outbox", "inv_folder_outbox.tga", "inv_folder_outbox.tga", FALSE, false));
addEntry(LLFolderType::FT_BASIC_ROOT, new ViewerFolderEntry("Basic Root", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", FALSE, false));