diff options
author | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2016-12-05 15:49:26 -0800 |
commit | 3c16beedc0d41834f22527aa916bd6c609786587 (patch) | |
tree | 7a7d2c3d4d5835adaef85179bd1cdcd8e2b954f5 /indra/newview/skins/default/xui/en/notifications.xml | |
parent | 2337134497fa5103d5baf9a0e790b2f294cd9750 (diff) | |
parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) |
Automated merge with lindenlab/viewer64 (itself, merged from viewer-release after bento/5.0 release)
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 804235518e..11e019e153 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1439,6 +1439,13 @@ Port settings take effect after you restart [APP_NAME]. <notification icon="alertmodal.tga" + name="ChangeDeferredDebugSetting" + type="alertmodal"> +This debug setting change will take effect after you restart [APP_NAME]. + </notification> + + <notification + icon="alertmodal.tga" name="ChangeSkin" type="alertmodal"> The new skin will appear after you restart [APP_NAME]. @@ -10501,6 +10508,14 @@ Not enough script resources available to attach object! </notification> <notification + icon="alertmodal.tga" + name="IllegalAttachment" + type="notify"> + <tag>fail</tag> + The attachment has requested a nonexistent point on the avatar. It has been attached to the chest instead. + </notification> + + <notification icon="alertmodal.tga" name="CantDropItemTrialUser" type="notify"> |