diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-21 15:59:18 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-21 15:59:18 -0700 |
| commit | 4859db1adabcf84b959ff0603f1bb8401232164c (patch) | |
| tree | 94772976ee3b8bae51eeb6510711da9e74b2a013 /indra/newview/skins | |
| parent | 477c66c890d5d87318705415315aaf9464bec2ff (diff) | |
MAINT-9026: Adding scale for sun and moon. Also don't allow the user to directly set the radio buttons for inventory and custom.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 130 |
1 files changed, 88 insertions, 42 deletions
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> |