summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2019-10-07 12:41:00 +0300
committermaxim_productengine <mnikolenko@productengine.com>2019-10-07 12:41:00 +0300
commit7ff09d05f2023ce8eb26acc46da22f8d86743de5 (patch)
treef5810d1ab168a5dd8b97a25cc790e5eaf9c7f1f8 /indra/newview/skins/default
parent7a7f68fb3c09c187f5b6fd333d0292a3fbfbc9df (diff)
SL-12024 Remove 'Estate warning' message and show just region name instead
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml70
1 files changed, 30 insertions, 40 deletions
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 bc0d59bcc7..edf1e1efd4 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -19,55 +19,44 @@
<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="400"
follows="all"
layout="topleft"
- left="0"
+ left="0"
animate="false"
orientation="vertical">
<layout_panel
user_resize="false"
+ auto_resize="false"
+ height="20"
+ name="pnl_environment_region_msg"
+ top="0">
+ <text follows="left|top"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left="10"
+ name="region_text_lbl"
+ top="6"
+ width="100">
+ Region:
+ </text>
+ <text follows="left|top"
+ font="SansSerif"
+ height="20"
+ layout="topleft"
+ left_delta="50"
+ name="region_text"
+ top_delta="0"
+ width="400">
+ unknown
+ </text>
+ </layout_panel>
+ <layout_panel
+ user_resize="false"
name="pnl_environment_disabled"
visible="false">
<text follows="top|left|bottom|right"
@@ -82,6 +71,7 @@
<layout_panel
user_resize="false"
min_height="0"
+ top="0"
name="pnl_environment_config"
visible="true">
<layout_stack