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

Touchups to deleting system folders, now use DELETE_SYSTEM_FOLDERS instead of not LL_RELEASE_FOR_DOWNLOAD, and bypass the folder protection check if this is the case.

Browse Source
This commit is contained in:
Lirusaito
2013-05-30 19:29:27 -04:00
parent dc4a52e1c4
commit 59e7b1c777
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventorybridge.cpp
View File

@@ -2896,7 +2896,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
restoreItem();
return;
}
#ifndef LL_RELEASE_FOR_DOWNLOAD
#ifdef DELETE_SYSTEM_FOLDERS
else if ("delete_system_folder" == action)
{
removeSystemFolder();
@@ -3455,7 +3455,7 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags)
mDisabledItems.push_back(std::string("Delete"));
}
#ifndef LL_RELEASE_FOR_DOWNLOAD
#ifdef DELETE_SYSTEM_FOLDERS
if (LLFolderType::lookupIsProtectedType(type))
{
mItems.push_back(std::string("Delete System Folder"));

2
indra/newview/llinventoryfunctions.cpp
View File

@@ -409,10 +409,12 @@ BOOL get_is_category_removable(const LLInventoryModel* model, const LLUUID& id)
const LLFolderType::EType folder_type = category->getPreferredType();
#ifndef DELETE_SYSTEM_FOLDERS
if (LLFolderType::lookupIsProtectedType(folder_type))
{
return FALSE;
}
#endif
// Can't delete the outfit that is currently being worn.
if (folder_type == LLFolderType::FT_OUTFIT)