diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-10 00:44:34 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-10 00:44:34 +0100 |
| commit | 4b174a31c8db1bf7f378f9b088c1335651a34ec5 (patch) | |
| tree | e731f5895870a2ba07281245e4a30665001a25bd /indra/newview/skins | |
| parent | 6015e2a5059a03c54c7024e84bb3467bf32c4436 (diff) | |
Move moisture/ice/droplet radius controls to atmos tab instead of (hidden) density tab.
Make frag shader version of vert WL shader to include rainbow/halo effect in non-advanced WL sky.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml | 63 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_sky_density.xml | 50 |
2 files changed, 63 insertions, 50 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index 18c2ac0db9..5af009e3aa 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -154,6 +154,69 @@ left_delta="-5" top_delta="25" width="80"> + Moisture Level: + </text> + <slider + decimal_digits="3" + follows="left|top" + height="14" + increment="0.001" + initial_value="0" + layout="topleft" + min_val="0" + max_val="1" + name="moisture_level" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Droplet Radius: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="14" + increment="0.01" + initial_value="0" + layout="topleft" + min_val="5.0" + max_val="1000.0" + name="droplet_radius" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Ice Level: + </text> + <slider + decimal_digits="1" + follows="left|top" + height="14" + increment="0.1" + initial_value="0" + layout="topleft" + min_val="0" + max_val="1" + name="ice_level" + width="207" + can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> Scene Gamma: </text> <slider diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml index a21ba44b32..b3a33961bc 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml @@ -269,55 +269,5 @@ label_width="160" can_edit_text="true"/> </layout_panel> - <layout_panel - border="true" - bevel_style="in" - auto_resize="true" - user_resize="false" - visible="true" - height="14"> - <slider - decimal_digits="3" - follows="left|top" - height="14" - increment="0.001" - initial_value="0" - layout="topleft" - min_val="0" - max_val="1" - name="moisture_level" - label="Moisture Level:" - width="400" - label_width="160" - can_edit_text="true"/> - <slider - decimal_digits="2" - follows="left|top" - height="14" - increment="0.01" - initial_value="0" - layout="topleft" - min_val="5.0" - max_val="1000.0" - name="droplet_radius" - label="Droplet Radius:" - width="400" - label_width="160" - can_edit_text="true"/> - <slider - decimal_digits="1" - follows="left|top" - height="14" - increment="0.1" - initial_value="0" - layout="topleft" - min_val="0" - max_val="1" - name="ice_level" - label="Ice Level:" - width="400" - label_width="160" - can_edit_text="true"/> - </layout_panel> </layout_stack> </panel> |