diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-02-10 22:40:28 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-02-10 22:40:28 -0800 |
| commit | 9ce64ec527f7b49b1641753ce6e67b8ed7f603c7 (patch) | |
| tree | 883f57213bd6cf2bb0e4fd505146d9a3e4889ab8 /indra | |
| parent | 4e1054a71fa158d3e5c2eaaaaf374829c33f52cb (diff) | |
DD-324 : Alert the user when we split a stock folder
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 2140f3b352..02c4d76a13 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1719,6 +1719,11 @@ bool validate_marketplacelistings(LLInventoryCategory* cat, validation_callback_ { if (fix_hierarchy && !has_bad_items) { + // Alert the user when an existing stock folder has to be split + if ((folder_type == LLFolderType::FT_MARKETPLACE_STOCK) && ((count >= 2) || (cat_array->size() > 0))) + { + LLNotificationsUtil::add("AlertMerchantStockFolderSplit"); + } // If we have more than 1 type of items or we are at the listing level, wrap the items in subfolders if ((count > 1) || (depth == 1)) { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 570a69256d..c4ae29b363 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -486,6 +486,18 @@ This listing could not be updated. </notification> <notification + icon="alertmodal.tga" + name="AlertMerchantStockFolderSplit" + type="alertmodal"> + We have separated stock items of different types into separate stock folders, so your folder is arranged in a way that we can list it. + <tag>confirm</tag> + <usetemplate + ignoretext="Alert when stock folder is being split before being listed" + name="okignore" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" name="CompileQueueSaveText" type="alertmodal"> |