From 7c6ac0740dac946275ef3f904614688f4b73f850 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 14 Sep 2018 09:52:28 -0700
Subject: SL-1556: Correctly identify when the selected parcel is in another
region and display a message about cross region environments.
---
indra/newview/skins/default/xui/en/panel_region_environment.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
(limited to 'indra/newview/skins')
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 3b77744f1b..3ce0d7a2ef 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -13,7 +13,9 @@
<string name="str_label_use_region">Use Region Settings</string>
<string name="str_unknow_inventory">Unknown</string>
<string name="str_altitude_desription">Sky [INDEX]([ALTITUDE]m)</string>
-
+ <string name="str_no_parcel">No parcel is selected. Environmental settings are disabled.</string>
+ <string name="str_cross_region">Environmental settings are not available across region boundries.</string>
+ <string name="str_legacy">Environmental settings are not available on this region.</string>
<layout_stack
width="530"
height="367"
@@ -29,8 +31,9 @@
halign="center"
valign="top"
top_pad="40"
+ name="txt_environment_disabled"
text_color="white">
-No parcel is selected. Environmental settings are disabled.
+ ...
</text>
</layout_panel>
<layout_panel
--
cgit v1.2.3