summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-08-21 19:25:06 +0100
committerGraham Linden <graham@lindenlab.com>2018-08-21 19:25:06 +0100
commit67d880781ee2463522edd11f9286635414aa46eb (patch)
tree3146816bbc9f0f1db1c9dc6eff2c6e22713bcd5c /indra/newview/skins/default/xui
parente3c2d3fd5138fa79946734e61b34d38e98c6a493 (diff)
parent163ae605be8871f37f19d94b71ec4370aadf9a49 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml4
-rw-r--r--indra/newview/skins/default/xui/en/menu_save_settings.xml7
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_region_environment.xml209
4 files changed, 145 insertions, 87 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 334de8e3db..37c4e3ff8d 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2106,7 +2106,7 @@ Only large parcels can be listed in search.
top="0"
help_topic="land_experiences_tab"
name="land_experiences_panel"
- class="land_experiences_panel"
+ class="land_experiences_panel"
filename="panel_region_experiences.xml">
</panel>
<panel
@@ -2118,7 +2118,7 @@ Only large parcels can be listed in search.
top="0"
help_topic="land_environment_tab"
name="land_environment_panel"
- class="land_environment_panel"
+ class="land_environment_panel"
filename="panel_region_environment.xml">
</panel>
</tab_container>
diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml
index a72b02c593..e3ed9a1741 100644
--- a/indra/newview/skins/default/xui/en/menu_save_settings.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml
@@ -20,6 +20,13 @@
userdata="saveas" />
</menu_item_call>
<menu_item_call
+ name="commit_changes"
+ label="Commit">
+ <menu_item_call.on_click
+ function="FlyoutCombo.Button.Action"
+ userdata="commit" />
+ </menu_item_call>
+ <menu_item_call
name="apply_local"
label="Apply Only To Myself">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9d406a14e1..f011fe0aaa 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4799,6 +4799,18 @@ Unchecking this option may remove restrictions that parcel owners have added to
<notification
icon="alertmodal.tga"
+ name="EstateParcelEnvironmentOverride"
+ type="alertmodal">
+Unchecking this option may remove any custom environments that parcel owners have added to their parcels. Please discuss with your parcel owners as needed.
+ <tag>confirm</tag>
+ <usetemplate
+ name="okbutton"
+ yestext="OK"/>
+ </notification>
+
+
+ <notification
+ icon="alertmodal.tga"
name="RegionEntryAccessBlocked"
type="alertmodal">
<tag>fail</tag>
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 41f58eef01..bb10e0c69e 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -1,82 +1,109 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- border="true"
- follows="top|left"
- height="300"
- label="Environment"
- layout="topleft"
- help_topic="panel_region_environment_tab"
- name="panel_env_info"
- width="530">
+ border="true"
+ follows="top|left"
+ height="300"
+ label="Environment"
+ layout="topleft"
+ help_topic="panel_region_environment_tab"
+ name="panel_env_info"
+ width="420">
+ <string name="str_label_use_default">Use Default Settings</string>
+ <string name="str_label_use_region">Use Region Settings</string>
+ <string name="str_unknow_inventory">Unknown</string>
+
<layout_stack
- left_offset="0"
- top_offset="0"
width="420"
- height="250"
+ height="450"
follows="left|right|top|bottom"
orientation="vertical">
<layout_panel
- auto_resize="false"
- user_resize="true"
- bg_alpha_color="red"
- min_height="130"
- background_visible="false">
+ auto_resize="true"
+ user_resize="false">
<layout_stack
- left_offset="5"
- top_offset="5"
- right_offset="-5"
+ left="5"
+ top="5"
+ right="-5"
follows="left|right|top|bottom"
orientation="horizontal">
<layout_panel
+ background_visible="true"
border="true"
bevel_style="in"
- auto_resize="false"
+ auto_resize="true"
user_resize="false"
- width="160"
- background_visible="true">
+ width="260"
+ min_width="260">
<text follows="top|left"
+ font="SansSerif"
halign="left"
- text_color="white">Environment Source</text>
+ text_color="white">Current Environment</text>
<radio_group
- follows="top|left"
- height="45"
+ height="90"
layout="topleft"
+ top_pad="5"
left_delta="10"
- name="environment_select_radio_group"
- bottom_delta="50"
- max_width="200"
- width="200">
+ name="rdg_environment_select">
+ <radio_item
+ label="[USEDEFAULT]"
+ layout="topleft"
+ name="rdo_use_xxx_setting"
+ height="20"/>
<radio_item
- label="Use Region Settings"
+ label="Settings From Inventory"
layout="topleft"
- name="use_region_setting"
+ valign="top"
+ name="rdo_use_inv_setting"
height="20"/>
<radio_item
+ top_pad="25"
label="Custom Environment"
layout="topleft"
height="20"
- name="use_custom_setting"/>
+ name="rdo_use_custom_setting"/>
</radio_group>
+ <line_editor
+ follows="top|left"
+ enabled="false"
+ left_delta="20"
+ top_delta="50"
+ height="20"
+ layout="topleft"
+ name="edt_inventory_name"
+ width="200">
+ Unknown
+ </line_editor>
+ <button
+ name="btn_select_inventory"
+ follows="top|left"
+ image_overlay="Command_Inventory_Icon"
+ auto_resize="false"
+ layout="topleft"
+ height="20"
+ width="20"
+ left_delta="205"
+ top_delta="0"/>
<button
- follows="top|right"
+ follows="top|left"
+ top_pad="25"
+ left_delta="-205"
+ layout="topleft"
height="23"
- label="Edit Custom"
- right_offset="30"
- bottom_offset="30"
- width="100"
- name="edit_btn"/>
+ label="Edit Environment"
+ width="120"
+ name="btn_edit"/>
</layout_panel>
<layout_panel
border="true"
bevel_style="in"
- auto_resize="false"
- user_resize="true"
- height="11"
- width="220"
+ auto_resize="true"
+ user_resize="false"
background_visible="true">
- <text follows="top|left|right"
+ <text
+ font="SansSerif"
+ follows="top|left|right"
halign="left"
text_color="white">Day Settings</text>
<text
@@ -92,7 +119,6 @@
</text>
<slider
can_edit_text="true"
- control_name="DayLengthSLD"
decimal_digits="1"
follows="left|top"
height="20"
@@ -101,10 +127,10 @@
layout="topleft"
left_delta="0"
top_pad="6"
- name="day_length_sld"
+ name="sld_day_length"
min_val="4"
max_val="178"
- width="200" />
+ width="180" />
<text
type="string"
length="1"
@@ -118,7 +144,6 @@
</text>
<slider
can_edit_text="true"
- control_name="DayOffsetSLD"
decimal_digits="1"
follows="left|top"
height="20"
@@ -127,53 +152,67 @@
layout="topleft"
left_delta="0"
top_pad="6"
- name="day_offset_sld"
+ name="sld_day_offset"
min_val="-12"
max_val="12"
- width="200" />
+ width="180" />
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left_delta="0"
+ top_pad="20"
+ width="200">
+ Apparent Time of Day Would Be:
+ </text>
+ <text
+ name="lbl_apparent_time"
+ type="string"
+ length="1"
+ follows="left|top"
+ height="12"
+ layout="topleft"
+ left_delta="10"
+ top_pad="5"
+ width="200">
+ [HH]:[MM][AP] ([PRC]%)
+ </text>
</layout_panel>
- <layout_panel name="flex"
- auto_resize="true"
- user_resize="true"
- visible="false"
- bg_alpha_color="blue"
- height="100"
- background_visible="true">
- </layout_panel>
</layout_stack>
</layout_panel>
<layout_panel
auto_resize="true"
- user_resize="true"
+ user_resize="false"
height="21"
- min_height="0"
- background_visible="false">
- <check_box
- height="16"
- label="Parcel Owners May Override"
- layout="topleft"
- left_offset="10"
- top_offset="10"
- name="allow_override_chk"
- width="200" />
- <button
- follows="top|left"
- height="23"
- label="Apply"
- left_offset="160"
- top_offset="60"
- name="apply_btn"
- width="100" />
- <button
- follows="top|left"
- height="23"
- label="Cancel"
- layout="topleft"
- left_pad="10"
- name="cancel_btn"
- width="100" />
-
+ min_height="0">
+ <check_box
+ height="20"
+ label="Parcel Owners May Override Environment"
+ layout="topleft"
+ left="10"
+ top="10"
+ name="chk_allow_override"
+ width="200" />
+ <button
+ follows="top|left"
+ height="23"
+ label="Apply"
+ top_pad="10"
+ name="btn_apply"
+ width="100" />
+ <button
+ follows="top|left"
+ height="23"
+ label="Reset"
+ layout="topleft"
+ left_pad="10"
+ top_delta="0"
+ name="btn_cancel"
+ width="100" />
+
</layout_panel>
</layout_stack>
</panel>