summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml16
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml7
2 files changed, 23 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"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8681c867bd..39c2cb79ad 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2782,6 +2782,13 @@ If you continue to receive this message, please contact Second Life support for
<string name="RegionSettings">Region Settings</string>
<string name="NoEnvironmentSettings">This Region does not support environmental settings.</string>
+ <string name="EnvironmentSun">Sun</string>
+ <string name="EnvironmentMoon">Moon</string>
+ <string name="EnvironmentBloom">Bloom</string>
+ <string name="EnvironmentCloudNoise">Cloud Noise</string>
+ <string name="EnvironmentNormalMap">Normal Map</string>
+ <string name="EnvironmentTransparent">Transparent</string>
+
<!-- panel classified -->
<string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string>
<string name="ClassifiedUpdateAfterPublish">(will update after publish)</string>