From 5fe626afabd2857980e8011ceb6081f9e9f108c7 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 2 Jan 2019 15:13:47 -0800
Subject: SL-10279: Most functionality now present. Still needs some cleanup on
 the bump code.

---
 .../newview/skins/default/xui/en/notifications.xml |  6 ++++--
 .../default/xui/en/panel_region_environment.xml    | 25 +++++-----------------
 2 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5c08bf50f6..b4cfe9d1b5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4811,10 +4811,12 @@ Unchecking this option may remove restrictions that parcel owners have added to
    icon="alertmodal.tga"
    name="EstateParcelEnvironmentOverride"
    type="alertmodal">
-Unchecking this option may remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
+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
-     name="okbutton"
+     name="okcancelbuttons"
+     notext="Cancel"
      yestext="OK"/>
   </notification>
   
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 1c2657ea60..7c08262d50 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -16,6 +16,7 @@
     <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>
+    <string name="str_disallowed">The estate manager does not allow changing parcel environments in this region.</string>
     <string name="str_empty">(empty)</string>
     <layout_stack 
             width="530"
@@ -383,7 +384,7 @@
                                     name="sld_day_length"
                                     min_val="4"
                                     max_val="168"
-                                    width="240" />
+                                    width="237" />
                             <text
                                     type="string"
                                     length="1"
@@ -408,7 +409,7 @@
                                     name="sld_day_offset"
                                     min_val="-11.5"
                                     max_val="12"
-                                    width="240" />
+                                    width="237" />
                             <text
                                     type="string"
                                     length="1"
@@ -432,30 +433,14 @@
                                     width="200">
                                 [HH]:[MM][AP] ([PRC]%)
                             </text>
-
                         </layout_panel>
                         <layout_panel
                                 follows="bottom"
                                 border="true"
                                 bevel_style="in"
                                 name="pnl_environment_buttons">
-                            <button
-                                    follows="bottom|right"
-                                    height="23"
-                                    label="Apply"
-                                    top="-60"
-                                    left="-220"
-                                    name="btn_apply"
-                                    width="100" />
-                            <button
-                                    follows="bottom|right"
-                                    height="23"
-                                    label="Reset"
-                                    layout="topleft"
-                                    left_pad="10"
-                                    top_delta="0"
-                                    name="btn_cancel"
-                                    width="100" /> 
+<!-- used to be buttons, but now spacer.
+-->
                         </layout_panel>
                     </layout_stack>
                 </layout_panel>
-- 
cgit v1.2.3