summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2019-12-16 13:03:13 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2019-12-16 13:03:13 +0000
commit7d202377fe431ce711a596a1f50d748a2071eae2 (patch)
tree446cc13a54ec9c6d11f195df85e38a30dddb9332 /indra/newview/skins/default
parent14fdd7c4908083e7e09c97d4ddc19eb1cb92de39 (diff)
parentbed0e63f1bbdb08d0d63de522504d3df6549e445 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml20
1 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d6b93cb42e..5557f07dfc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8492,6 +8492,26 @@ This will upload [COUNT] items at a total cost of L$[COST]. Do you wish to conti
name="okcancelbuttons"
notext="Cancel"
yestext="Upload"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="BulkUploadNoCompatibleFiles"
+ type="alertmodal">
+Selected files can not be bulk-uploaded.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="BulkUploadIncompatibleFiles"
+ type="alertmodal">
+Some of the selected files can not be bulk-uploaded.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
</notification>
<notification