diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-22 00:56:27 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-22 00:56:27 +0100 |
| commit | a27501d21626e0026a184aaf9bc24a22d0f636bb (patch) | |
| tree | c4e205489126a3d8cc8aa5ffd97fd80e82e6131c /indra/newview/skins | |
| parent | ab1c7087e944ea9ded217770176e3444c8c39c0d (diff) | |
| parent | 93342e3201cfd83b4cda0a194e900999d3753f46 (diff) | |
Merge 5.1.9
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_environment.xml | 24 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 130 |
2 files changed, 109 insertions, 45 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" diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml index 2b79a1056f..586aff4bb8 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml @@ -32,39 +32,39 @@ width="120"> Sun & Stars </text> - <text - follows="left|top" - height="10" - layout="topleft" - left_delta="10" - top_delta="30" - width="100"> - Position: - </text> - <sun_moon_trackball - name="sun_rotation" - follows="left|top" - left_delta="0" - top_delta="20" - height="150" - width="150" - thumb_mode="sun" /> - <text - follows="left|top" - height="10" - layout="topleft" - left_delta="160" - top_delta="-20" - width="200"> - Image: - </text> - <texture_picker - height="123" - layout="topleft" - left_delta="5" - name="sun_image" - top_pad="10" - width="100"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="10" + top_delta="30" + width="100"> + Position: + </text> + <sun_moon_trackball + name="sun_rotation" + follows="left|top" + left_delta="0" + top_delta="20" + height="150" + width="150" + thumb_mode="sun" /> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="160" + top_delta="-20" + width="200"> + Image: + </text> + <texture_picker + height="123" + layout="topleft" + left_delta="5" + name="sun_image" + top_pad="10" + width="100"/> <text follows="left|top" height="10" @@ -72,6 +72,29 @@ left_delta="-5" top_delta="110" width="80"> + Scale: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.25" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.25" + max_val="20" + name="sun_scale" + top_delta="15" + width="130" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="20" + width="80"> Color: </text> <color_swatch @@ -89,7 +112,7 @@ height="10" layout="topleft" left_delta="-160" - top_delta="47" + top_delta="27" width="200"> Glow Focus: </text> @@ -135,7 +158,7 @@ height="10" layout="topleft" left_delta="-5" - top_delta="30" + top_delta="22" width="200"> Star Brightness: </text> @@ -195,13 +218,13 @@ Position: </text> <sun_moon_trackball - name="moon_rotation" - follows="left|top" - left_delta="0" - top_delta="20" - height="150" - width="150" - thumb_mode="moon" /> + name="moon_rotation" + follows="left|top" + left_delta="0" + top_delta="20" + height="150" + width="150" + thumb_mode="moon" /> <text follows="left|top" height="10" @@ -218,6 +241,29 @@ name="moon_image" top_pad="10" width="100"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="110" + width="80"> + Scale: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.25" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.25" + max_val="20" + name="sun_scale" + top_delta="15" + width="130" + can_edit_text="true"/> </layout_panel> </layout_stack> </layout_panel> |