2 files changed, 42 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 228c50bb6d..35c51dbc52 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4896,7 +4896,7 @@ Unchecking this option may remove restrictions that parcel owners have added to
    icon="alertmodal.tga"
    name="EstateParcelEnvironmentOverride"
    type="alertmodal">
-Unchecking this option will remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
+(Estate-wide change: [ESTATENAME]) Unchecking this option will remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
 Do you wish to proceed?
     <tag>confirm</tag>
     <usetemplate
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 f2f2d73a06..bc0d59bcc7 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -19,11 +19,51 @@
     <string name="str_too_small">The parcel must be at least 128 square meters to support an environment.</string>
     <string name="str_empty">(empty)</string>
     <string name="str_region_env">(region environment)</string>
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="32"
+      layout="topleft"
+      left="10"
+      name="env_help_text"
+      top="14"
+      word_wrap="true">
+       Changes to settings on this tab will affect all regions in the estate.
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     right="160"
+     name="estate_text"
+     top_pad="2"
+     halign="right"
+     width="140">
+        Estate:
+    </text>
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     font="SansSerif"
+     height="20"
+     layout="topleft"
+     top_delta="0"
+     name="estate_name"
+     left_pad="6"
+     width="150">
+        (unknown)
+    </text>
     <layout_stack 
             width="530"
-            height="367"
+            height="400"
             follows="all"
             layout="topleft"
+						left="0"
             animate="false"
             orientation="vertical">
         <layout_panel