Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support Legacy Region/Estate Environment

Browse Source 
Also Disable Environment Tab when the cap required to use it isn't supported.
This commit is contained in:
Lirusaito
2013-04-17 19:42:56 -04:00
parent 5ac2a23b8d
commit 11b4eb153c
5 changed files with 172 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
indra/newview/skins/default/xui/en-us/panel_region_estate.xml
View File

@@ -82,10 +82,10 @@
<view_border
bevel_style="none"
follows="top|left"
height="95"
height="110"
layout="topleft"
left="10"
bottom_delta="-100"
bottom_delta="-115"
width="460" />
<check_box
@@ -95,7 +95,7 @@
layout="topleft"
left="20"
name="externally_visible_check"
bottom_delta="70"
bottom_delta="90"
width="200" />
<button
bottom_delta="0"
@@ -112,9 +112,9 @@
height="20"
label="Allow Voice Chat"
layout="topleft"
left="250"
left_delta="-200"
name="voice_chat_check"
bottom_delta="0"
bottom_delta="-18"
width="200" />
<button
bottom_delta="0"
@@ -133,7 +133,7 @@
layout="topleft"
left_delta="-200"
name="allow_direct_teleport"
bottom_delta="-20"
bottom_delta="-18"
width="80" />
<button
bottom_delta="0"
@@ -144,6 +144,13 @@
name="allow_direct_teleport_help"
left_delta="200"
width="18" />
<check_box bottom_delta="36" follows="left|top" height="20" label="Use Global Time" left="250" name="use_global_time_check" width="200" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_global_time_help" left_delta="200" width="18" />
<check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
<icon bottom_delta="-27" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
<slider bottom_delta="-16" follows="left|top" height="20" increment="0.001"
label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
<button
enabled="false"
follows="left|top"
@@ -151,9 +158,9 @@
label="Apply"
layout="topleft"
name="apply_btn"
bottom_delta="-38"
left_delta="-200"
width="97" />
bottom_delta="-23"
left_delta="90"
width="120" />
<text
type="string"
@@ -164,7 +171,7 @@
layout="topleft"
left="20"
name="Only Allow"
bottom_delta="38"
bottom_delta="28"
width="278">
Allow access only to Residents who:
</text>
@@ -177,7 +184,7 @@
left_delta="0"
name="limit_payment"
tool_tip="Residents must have payment information on file to access this estate."
bottom_delta="-18"
bottom_delta="-16"
width="278" />
<check_box
follows="top|left"
@@ -188,7 +195,7 @@
left_delta="0"
name="limit_age_verified"
tool_tip="Residents must be age 18 or older to access this estate. See support.secondlife.com for more information."
bottom_delta="-18"
bottom_delta="-16"
width="278" />
<text
@@ -198,7 +205,7 @@
height="20"
layout="topleft"
name="estate_manager_label"
bottom_delta="-40"
bottom_delta="-28"
left="10"
width="200">
Estate Managers:
@@ -220,7 +227,7 @@
layout="topleft"
left="250"
name="allow_resident_label"
bottom_delta="0"
bottom_delta="-4"
width="200">
Allowed Residents:
</text>
@@ -241,7 +248,7 @@
height="71"
layout="topleft"
left="10"
bottom_delta="-76"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
@@ -320,7 +327,7 @@
layout="topleft"
left="10"
name="allow_group_label"
bottom_delta="-30"
bottom_delta="-28"
width="200">
Allowed Groups:
</text>
@@ -341,7 +348,7 @@
layout="topleft"
left="250"
name="ban_resident_label"
bottom_delta="0"
bottom_delta="-4"
width="200">
Banned Residents:
</text>
@@ -362,7 +369,7 @@
height="71"
layout="topleft"
left="10"
bottom_delta="-76"
bottom_delta="-72"
width="220" />
<name_list
follows="left|top"
@@ -440,7 +447,7 @@
layout="topleft"
left="10"
name="message_estate_btn"
bottom_delta="-43"
bottom_delta="-28"
width="220" />
<button
follows="left|top"

9
indra/newview/skins/default/xui/en-us/panel_region_general.xml
View File

@@ -85,7 +85,14 @@
</combo_box>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
left="205" name="access_help" width="18" />
<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
<check_box bottom_delta="52" follows="left|top" height="20" label="Use Estate Sun" left="250" name="use_estate_sun_check" width="200" />
<button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="use_estate_sun_help" left_delta="200" width="18" />
<check_box bottom_delta="-18" follows="left|top" height="20" label="Fixed Sun" left_delta="-200" name="fixed_sun_check" width="100" />
<button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?" name="fixed_sun_help" left_delta="200" width="18" />
<icon bottom_delta="-23" follows="left|top" height="20" image_name="icon_day_cycle.tga" left_delta="-160" name="daycycle" width="160"/>
<slider bottom_delta="-15" follows="left|top" height="20" increment="0.001"
label="Phase" left_delta="-35" max_val="30" min_val="6" name="sun_hour_slider" show_text="false" width="200" />
<button bottom_delta="-20" enabled="false" follows="left|top" height="20" label="Apply"
left="108" name="apply_btn" width="100" />
<button bottom_delta="-60" follows="left|top" height="20"
label="Teleport Home One User..." left="10" name="kick_btn" width="250" />