summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-03-10 15:07:55 -0800
committerRider Linden <rider@lindenlab.com>2017-03-10 15:07:55 -0800
commit880be86cf2f8d7cb7e948d8a456fd8cf5723b3f2 (patch)
tree3ee5ec8488536d308e774e63dcaa24a3a77ada6b /indra/newview/skins/default
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (diff)
MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_estate.xml20
1 files changed, 14 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 76a82212ae..69e7a7b7a5 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -98,20 +98,28 @@
width="200" />
<check_box
- height="20"
- label="Allow Voice Chat"
+ height="18"
+ label="Allow Parcel Access Override"
layout="topleft"
left="280"
- name="voice_chat_check"
+ name="parcel_access_override"
top_delta="0"
width="200" />
<check_box
- height="20"
+ height="18"
+ label="Allow Voice Chat"
+ layout="topleft"
+ left_delta ="0"
+ name="voice_chat_check"
+ top_pad="4"
+ width="200" />
+ <check_box
+ height="18"
label="Allow Direct Teleport"
layout="topleft"
left_delta="0"
name="allow_direct_teleport"
- top_pad="4"
+ top_pad="2"
width="80" />
<button
enabled="false"
@@ -120,7 +128,7 @@
label="Apply"
layout="topleft"
name="apply_btn"
- top_pad="15"
+ top_pad="7"
left_delta="0"
width="97" />