diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-10 20:31:10 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-10 20:31:10 +0000 |
| commit | de34937c50492cb9d79859af000554d876ef7267 (patch) | |
| tree | 71afaf9dc2caf91d843a34fd8691055d93cd7f49 /indra/newview/skins/default/xui | |
| parent | 198b3b6b99f494543c62b4e0923c14931fd4ab00 (diff) | |
| parent | 89a9eb1e54bbc421006ade44ba048b00e0a5a4a3 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #143)
SL-1925
Diffstat (limited to 'indra/newview/skins/default/xui')
3 files changed, 86 insertions, 73 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> 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 1332ecd965..e63b7e41b4 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 @@ -176,29 +176,6 @@ top_delta="15" width="250" can_edit_text="true"/> - <text - follows="left|top" - height="10" - layout="topleft" - left_delta="-5" - top_delta="22" - width="200"> - Moon Brightness: - </text> - <slider - decimal_digits="2" - follows="left|top" - height="16" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="5" - min_val="0.0" - max_val="1.0" - name="moon_brightness" - top_delta="15" - width="250" - can_edit_text="true"/> </layout_panel> <layout_panel border="false" @@ -287,6 +264,29 @@ top_delta="15" width="130" can_edit_text="true"/> + <text + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="22" + width="200"> + Brightness: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.0" + max_val="1.0" + name="moon_brightness" + top_delta="15" + width="130" + can_edit_text="true"/> </layout_panel> </layout_stack> </layout_panel> |