summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2014-05-06 19:40:40 +0100
committerCho <cho@lindenlab.com>2014-05-06 19:40:40 +0100
commit6e5452829ad452bacef92f1bdfed9d27a8d8fa98 (patch)
treee2956af2fc71941662c03944d56df14b5fe8dcd4 /indra/newview
parente925bb8fc4376fa289d7759db00cdf695761af07 (diff)
Added top caption for ACME-1434
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_experiences.xml28
1 files changed, 20 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
index f586b7b5d9..b0ef3284f1 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -23,13 +23,25 @@
Trusted Experiences
</panel.string>
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="32"
+ layout="topleft"
+ left="10"
+ name="experiences_help_text"
+ top="14"
+ word_wrap="true">
+ Changes to settings on this tab will affect all regions in the estate.
+ </text>
<layout_stack
left="5"
layout="topleft"
follows="all"
- top="0"
+ top="40"
right="-5"
- height="320"
+ height="280"
min_height="140"
orientation="vertical">
<layout_panel
@@ -43,9 +55,9 @@
filename="panel_experience_list_editor.xml" />
<text
layout="topleft"
- name="text_help"
+ name="trusted_text_help"
length="1"
- top="20"
+ top="5"
left_pad="5"
width="200"
height="200"
@@ -69,9 +81,9 @@ Any Experience may be Trusted.
filename="panel_experience_list_editor.xml"/>
<text
layout="topleft"
- name="text_help"
+ name="allowed_text_help"
length="1"
- top="20"
+ top="5"
left_pad="5"
width="200"
height="200"
@@ -93,9 +105,9 @@ Only Experiences that are not Grid-Wide may be Allowed.
filename="panel_experience_list_editor.xml"/>
<text
layout="topleft"
- name="text_help"
+ name="blocked_text_help"
length="1"
- top="20"
+ top="5"
left_pad="5"
width="200"
height="200"