summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_region_estate.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_region_estate.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_estate.xml157
1 files changed, 80 insertions, 77 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..a0c1dd0be6 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -82,36 +82,72 @@
<view_border
bevel_style="none"
follows="top|left"
- height="95"
+ height="105"
layout="topleft"
left="10"
top_pad="5"
- width="470" />
-
+ width="505" />
+ <radio_group
+ height="32"
+ layout="topleft"
+ name="externally_visible_radio"
+ top_delta="5"
+ left="20"
+ width="200">
+ <radio_item
+ height="16"
+ label="Allow only residents and groups listed below"
+ layout="topleft"
+ name="estate_restricted_access" />
+ <radio_item
+ height="16"
+ label="Anyone can visit"
+ layout="topleft"
+ name="estate_public_access" />
+ </radio_group>
<check_box
- height="20"
- label="Allow Public Access"
+ follows="top|left"
+ height="18"
+ label="Must be 18+"
+ layout="topleft"
+ left_delta="20"
+ name="limit_age_verified"
+ tool_tip="Residents must be age 18 or older to access this estate. See the [SUPPORT_SITE] for more information."
+ top_delta="40"
+ width="278" />
+ <check_box
+ follows="top|left"
+ height="18"
+ label="Must have payment info on file"
+ layout="topleft"
+ left_delta="0"
+ name="limit_payment"
+ tool_tip="Residents must have payment information on file to access this estate. See the [SUPPORT_SITE] for more information."
+ top_pad="2"
+ width="278" />
+ <check_box
+ height="18"
+ label="Parcel owners can be more restrictive"
layout="topleft"
left="20"
- name="externally_visible_check"
- top_delta="5"
- width="200" />
-
+ name="parcel_access_override"
+ top_pad="2"
+ width="240" />
<check_box
- height="20"
+ height="18"
label="Allow Voice Chat"
layout="topleft"
- left="280"
+ left="290"
name="voice_chat_check"
- top_delta="0"
+ top_delta="-78"
width="200" />
<check_box
- height="20"
+ 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,43 +156,10 @@
label="Apply"
layout="topleft"
name="apply_btn"
- top_pad="15"
+ top_pad="30"
left_delta="0"
width="97" />
-
- <text
- type="string"
- length="1"
- follows="top|left"
- height="16"
- layout="topleft"
- left="20"
- name="Only Allow"
- top_delta="-30"
- width="278">
- Allow access only to Residents who:
- </text>
- <check_box
- follows="top|left"
- height="16"
- label="Have payment information on file"
- layout="topleft"
- left_delta="0"
- name="limit_payment"
- tool_tip="Residents must have payment information on file to access this estate. See the [SUPPORT_SITE] for more information."
- top_pad="2"
- width="278" />
- <check_box
- follows="top|left"
- height="16"
- label="Are age 18 or older"
- layout="topleft"
- left_delta="0"
- name="limit_age_verified"
- tool_tip="Residents must be age 18 or older to access this estate. See the [SUPPORT_SITE] for more information."
- top_pad="2"
- width="278" />
-
+
<text
type="string"
length="1"
@@ -165,7 +168,7 @@
height="20"
layout="topleft"
name="estate_manager_label"
- top_pad="30"
+ top_pad="25"
left="10"
width="200">
Estate Managers:
@@ -180,7 +183,7 @@
name="allow_resident_label"
top_delta="0"
width="200">
- Allowed Residents:
+ Always allowed:
</text>
<!-- Estate Managers box -->
@@ -191,7 +194,7 @@
layout="topleft"
left="10"
top_pad="-5"
- width="200" />
+ width="235" />
<name_list
follows="left|top"
height="71"
@@ -200,9 +203,9 @@
multi_select="true"
name="estate_manager_name_list"
top_delta="0"
- width="200" />
+ width="235" />
- <!-- Allowed Residents box -->
+ <!-- Always allowed box -->
<view_border
bevel_style="none"
follows="top|left"
@@ -210,7 +213,7 @@
layout="topleft"
left="280"
top_delta="0"
- width="200" />
+ width="235" />
<name_list
follows="left|top"
height="71"
@@ -219,7 +222,7 @@
multi_select="true"
name="allowed_avatar_name_list"
top_delta="0"
- width="200" />
+ width="235" />
<!-- Estate Managers buttons -->
<button
@@ -230,7 +233,7 @@
left="10"
name="add_estate_manager_btn"
top_pad="6"
- width="97" />
+ width="114" />
<button
follows="left|top"
height="23"
@@ -238,9 +241,9 @@
layout="topleft"
name="remove_estate_manager_btn"
left_pad="6"
- width="97" />
+ width="114" />
- <!-- Allowed Residents buttons -->
+ <!-- Always allowed buttons -->
<button
follows="left|top"
height="23"
@@ -249,7 +252,7 @@
layout="topleft"
name="add_allowed_avatar_btn"
top_delta="0"
- width="97" />
+ width="114" />
<button
follows="left|top"
height="23"
@@ -258,7 +261,7 @@
name="remove_allowed_avatar_btn"
left_pad="6"
top_delta="0"
- width="97" />
+ width="114" />
<text
type="string"
@@ -270,7 +273,7 @@
name="allow_group_label"
top_pad="10"
width="200">
- Allowed Groups:
+ Groups always allowed:
</text>
<text
type="string"
@@ -282,10 +285,10 @@
name="ban_resident_label"
top_delta="0"
width="200">
- Banned Residents:
+ Always banned:
</text>
- <!-- Allowed Groups box -->
+ <!-- Groups always allowed box -->
<view_border
bevel_style="none"
follows="top|left"
@@ -293,7 +296,7 @@
layout="topleft"
left="10"
top_pad="-5"
- width="200" />
+ width="235" />
<name_list
follows="left|top"
height="71"
@@ -302,9 +305,9 @@
multi_select="true"
name="allowed_group_name_list"
top_delta="0"
- width="200" />
+ width="235" />
- <!-- Banned Residents box -->
+ <!-- Always banned box -->
<view_border
bevel_style="none"
follows="top|left"
@@ -312,7 +315,7 @@
layout="topleft"
left="280"
top_delta="0"
- width="200" />
+ width="235" />
<name_list
follows="left|top"
height="71"
@@ -321,9 +324,9 @@
multi_select="true"
name="banned_avatar_name_list"
top_delta="0"
- width="200" />
+ width="235" />
- <!-- Allowed Groups buttons -->
+ <!-- Groups always allowed buttons -->
<button
follows="left|top"
height="23"
@@ -332,7 +335,7 @@
left="10"
name="add_allowed_group_btn"
top_pad="6"
- width="97" />
+ width="114" />
<button
follows="left|top"
height="23"
@@ -341,9 +344,9 @@
name="remove_allowed_group_btn"
left_pad="6"
top_delta="0"
- width="97" />
+ width="114" />
- <!-- Banned Residents buttons -->
+ <!-- Always banned buttons -->
<button
follows="left|top"
height="23"
@@ -352,7 +355,7 @@
left="280"
name="add_banned_avatar_btn"
top_delta="0"
- width="97" />
+ width="114" />
<button
follows="left|top"
height="23"
@@ -361,7 +364,7 @@
name="remove_banned_avatar_btn"
top_delta="0"
left_pad="6"
- width="97" />
+ width="114" />
<button
follows="left|top"
@@ -371,7 +374,7 @@
left="10"
name="message_estate_btn"
top_pad="20"
- width="220" />
+ width="235" />
<button
follows="left|top"
height="23"
@@ -380,6 +383,6 @@
left="280"
name="kick_user_from_estate_btn"
top_delta="0"
- width="220" />
+ width="235" />
</panel>