diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-08-12 19:12:44 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2026-08-12 19:12:44 -0400 |
| commit | e3a92a3f8e7d6df3772adcecb037149e6fcf0f3e (patch) | |
| tree | 537bdcfb9019a39b45a27f8d04f8ca3c1c5d87e6 /indra/newview/skins | |
| parent | 159a08c98dcba2bdf25caf13b236e27c54eda050 (diff) | |
| parent | b6648c2b4b69eceb5264b850d92702ae1c5e6911 (diff) | |
Merge branch 'develop' into geenz/linux-to-develop
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 42ec875bcd..833a09eab8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -425,6 +425,17 @@ Initialization with the Marketplace failed because of a system or network error. </notification> <notification + icon="alertmodal.tga" + name="CannotPasteFolderIntoSelf" + type="alertmodal"> + You cannot paste a folder into itself or into one of its subfolders. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="notifytip.tga" name="InvalidKeystroke" type="notifytip"> |