diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-21 11:37:59 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-21 11:37:59 -0700 |
| commit | 477c66c890d5d87318705415315aaf9464bec2ff (patch) | |
| tree | 48cdffe375ef2de59eb241c58713ab7a335e37a8 /indra/newview/skins/default | |
| parent | 163ae605be8871f37f19d94b71ec4370aadf9a49 (diff) | |
Lest couple nullptr checks and disable the controls on legacy regions.
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_environment.xml | 24 |
1 files changed, 21 insertions, 3 deletions
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 bb10e0c69e..3a1a8c432a 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -18,9 +18,26 @@ height="450" follows="left|right|top|bottom" orientation="vertical"> + <layout_panel + auto_resize="true" + user_resize="false" + name="pnl_environment_disabled" + visible="false"> + <text follows="top|left|bottom|right" + font="SansSerif" + halign="center" + valign="top" + top_pad="20" + text_color="white"> +Parcel environmental settings are +disabled on legacy regions. + </text> + </layout_panel> <layout_panel auto_resize="true" - user_resize="false"> + user_resize="false" + name="pnl_environment_config" + visible="true"> <layout_stack left="5" top="5" @@ -165,7 +182,7 @@ left_delta="0" top_pad="20" width="200"> - Apparent Time of Day Would Be: + Apparent Time of Day: </text> <text name="lbl_apparent_time" @@ -187,7 +204,8 @@ auto_resize="true" user_resize="false" height="21" - min_height="0"> + min_height="0" + name="pnl_environment_buttons"> <check_box height="20" label="Parcel Owners May Override Environment" |