From caa5b92fb77f55360032a3dac10385c84b457cbf Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Mon, 11 Jul 2022 16:46:19 +0300
Subject: [PATCH] SL-17665 additional checks to avoid moving protected folders
---
indra/newview/llinventoryfunctions.cpp | 4 ++--
indra/newview/skins/default/xui/en/notifications.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index d8a4340254d..27edc8148ef 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -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;
}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0a3826123c3..1ee0d9c64a1 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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/>
--
GitLab