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

SL-17665 additional checks to avoid moving protected folders

master
Mnikolenko Productengine 2022-07-11 16:46:19 +03:00
parent 6fc22df480
commit caa5b92fb7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventoryfunctions.cpp
View File

@ -1880,7 +1880,7 @@ void move_items_to_folder(const LLUUID& new_cat_uuid, const uuid_vec_t& selected
else
{
LLInventoryCategory* inv_cat = gInventory.getCategory(*it);
if (inv_cat)
if (inv_cat && !LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
{
gInventory.changeCategoryParent((LLViewerInventoryCategory*)inv_cat, new_cat_uuid, false);
}
@ -2646,7 +2646,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
if (selected_uuid_set.size() == 1)
{
LLInventoryCategory* inv_cat = gInventory.getCategory(*ids.begin());
if (!inv_cat)
if (!inv_cat || LLFolderType::lookupIsProtectedType(inv_cat->getPreferredType()))
{
return;
}

4
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -11663,7 +11663,7 @@ This Region does not support environmental settings.
<notification
icon="alertmodal.tga"
label="Save Outfit"
label="Save Environmental Settings"
name="SaveSettingAs"
type="alertmodal">
<unique/>
@ -11844,7 +11844,7 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB
<notification
icon="alertmodal.tga"
label="Save Outfit"
label="Create subfolder"
name="CreateSubfolder"
type="alertmodal">
<unique/>