summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-10-09 19:00:48 +0000
committerRider Linden <rider@lindenlab.com>2018-10-09 19:00:48 +0000
commitac6d2b09c048d8589c572acb2965a0643b07d5ce (patch)
tree4592bf63d6fc464c9e1a961e4b64af4233ab93bf /indra/newview/skins/default/xui/en/notifications.xml
parentc2cbb40a0eecb1c3b4a21ffa4d169f23f1e7006b (diff)
parent83b508a656aebedff915b2fdcd292432a8aaa7b2 (diff)
Merged in andreykproductengine/maint-eep2 (pull request #137)
SL-9746 [EEP] Local Texture options should work with EEP Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 69503cdbf2..23e1701dc6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6072,6 +6072,22 @@ Sorry, the settings couldn't be applied to the region. Reason: [FAIL_REASON]
</notification>
<notification
+ icon="alertmodal.tga"
+ name="WLLocalTextureDayBlock"
+ type="alertmodal">
+A Local texture is in use on track [TRACK], frame #[FRAMENO] ([FRAME]%) in field [FIELD].
+Settings may not be saved using local textures.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="WLLocalTextureFixedBlock"
+ type="alertmodal">
+A local texture is in use in field [FIELD].
+Settings may not be saved using local textures.
+ </notification>
+
+ <notification
functor="GenericAcknowledge"
icon="alertmodal.tga"
name="EnvCannotDeleteLastDayCycleKey"