FIRE-32736: Add confirmation before ungrouping folder

meow-7.2.2
Ansariel 2023-02-17 15:24:31 +01:00
parent 79c9873cd0
commit 69a01606c1
3 changed files with 33 additions and 0 deletions

View File

@ -2994,6 +2994,18 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
{
return;
}
// <FS:Ansariel> FIRE-32736: Add confirmation before ungrouping folder
LLSD args;
args["FOLDER_NAME"] = inv_cat->getName();
LLNotificationsUtil::add("UngroupFolder", args, LLSD(),
[inv_cat](const LLSD& notification, const LLSD& response)
{
S32 opt = LLNotificationsUtil::getSelectedOption(notification, response);
if (opt == 1)
return;
// </FS:Ansariel>
const LLUUID &new_cat_uuid = inv_cat->getParentUUID();
LLInventoryModel::cat_array_t* cat_array;
LLInventoryModel::item_array_t* item_array;
@ -3019,6 +3031,9 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
}
gInventory.removeCategory(inv_cat->getUUID());
gInventory.notifyObservers();
}); // <FS:Ansariel> FIRE-32736: Add confirmation before ungrouping folder
}
}
// <FS:Ansariel> FIRE-22851: Show texture "Save as" file picker subsequently instead all at once

View File

@ -5600,4 +5600,8 @@ URL auf Standard zurücksetzen?
[SOURCES]
</notification>
<notification label="Ordner-Gruppierung aufheben" name="UngroupFolder">
Gruppierung durch den Ordner „[FOLDER_NAME]“ aufheben?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Okay"/>
</notification>
</notifications>

View File

@ -13930,4 +13930,18 @@ Camera reset might be inhibited by the following objects:
[SOURCES]
</notification>
<notification
icon="alertmodal.tga"
label="Ungroup folder"
name="UngroupFolder"
type="alertmodal">
<unique/>
Ungroup the folder "[FOLDER_NAME]"?
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="Okay"/>
</notification>
</notifications>