diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-08-04 10:59:26 -0700 |
| commit | 38208441db5e969112a4b911aa4d063d5a1031f2 (patch) | |
| tree | 84158d6183058b48737ba9b19304bd4ae5f57afa /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 92b09e3a164e59f5a0c4e436d044590513ddc6bd (diff) | |
| parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-559
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 59 |
1 files changed, 58 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ae4b0538d8..24a934fbb8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9122,6 +9122,29 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran <notification icon="alertmodal.tga" + name="FacePasteFailed" + type="alertmodal"> +Paste failed. [REASON] + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="FacePasteTexturePermissions" + type="alertmodal"> + You applied a texture with limited permissions, object will inherit permissions from texture. + <usetemplate + ignoretext="Paste: You applied a texture with limited permissions" + name="notifyignore"/> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="ConfirmLeaveCall" type="alertmodal"> Are you sure you want to leave this call? @@ -11722,7 +11745,7 @@ This Region does not support environmental settings. <notification icon="alertmodal.tga" - label="Save Outfit" + label="Save Environmental Settings" name="SaveSettingAs" type="alertmodal"> <unique/> @@ -11901,6 +11924,40 @@ Unpacking: [UNPACK_TIME]s [USIZE]KB </form> </notification> + <notification + icon="alertmodal.tga" + label="Create subfolder" + name="CreateSubfolder" + type="alertmodal"> + <unique/> + Name the new folder: + <tag>confirm</tag> + <form name="form"> + <input name="message" type="text"> + [DESC] + </input> + <button + default="true" + index="0" + name="OK" + text="OK"/> + <button + index="1" + name="Cancel" + text="Cancel"/> + </form> + </notification> + <notification + icon="alertmodal.tga" + name="SameFolderRequired" + type="alert"> + Selected items must be in the same folder. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + <notification icon="notifytip.tga" name="MaterialCreated" |