diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:07 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:49 +0300 |
| commit | d19d82712125b8a70056f2fa288cdd25205770a8 (patch) | |
| tree | ece789aa802dac877fc8fe8cb035894e3a4427a6 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | fbccc0986d6487c4490edee6e5793fcaeaf3415b (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
Merge branch master (DRTVWR-483) into DRTVWR-559
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index c618c5bf32..d2a35241ba 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1496,7 +1496,19 @@ Insufficient funds to create classified. <notification icon="alertmodal.tga" - name="DeleteAvatarPick" + name="ProfileDeleteClassified" + type="alertmodal"> +Delete classified <nolink>[CLASSIFIED]</nolink>? + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="ProfileDeletePick" type="alertmodal"> Delete pick <nolink>[PICK]</nolink>? <tag>confirm</tag> @@ -1507,6 +1519,32 @@ Delete pick <nolink>[PICK]</nolink>? </notification> <notification + icon="alert.tga" + name="ProfileUnpublishedClassified" + type="alert"> + You have unpublished classifieds. They will be lost if you close the window. + <tag>confirm</tag> + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="OK"/> + </notification> + + <notification + icon="alert.tga" + name="ProfileUnsavedChanges" + type="alert"> + You have usaved changes. + <tag>confirm</tag> + <tag>save</tag> + <usetemplate + canceltext="Cancel" + name="yesnocancelbuttons" + notext="Discard" + yestext="Save"/> + </notification> + + <notification icon="alertmodal.tga" name="DeleteOutfits" type="alertmodal"> |