diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-07-30 15:55:33 -0700 |
| commit | dbbb89a13c99dce50b5c2a124bd3a5ccc23ef7f6 (patch) | |
| tree | 51217fdcd57e3adcbe7ba6e428c4e0f0a68012a3 /indra/newview/skins | |
| parent | d6ede8e81cad497a6cd8482dfb48c99bdf5c258a (diff) | |
| parent | d7ae8a0d28483a8ed5d93152177aa655266f7004 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins')
5 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index aac2084543..caf7153a5c 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -219,7 +219,8 @@ draw_track="false" follows="bottom" height="10" - increment="0.01" + increment="0.005" + overlap_threshold="0.026" initial_value="0" layout="topleft" left="10" @@ -235,7 +236,8 @@ decimal_digits="0" follows="bottom" height="10" - increment="0.01" + increment="0.005" + overlap_threshold="0.026" initial_value="0" layout="topleft" left="10" 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 21518338ff..e469143e41 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -48,9 +48,9 @@ max_width="200" width="200"> <radio_item - label="Default Environment" + label="Use Region Settings" layout="topleft" - name="use_default_setting" + name="use_region_setting" height="20"/> <radio_item label="Custom Environment" diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml index b4c3089942..412ed8bf82 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml @@ -120,7 +120,7 @@ Cloud Image: </text> <texture_picker - height="100" + height="123" layout="topleft" left_delta="5" name="cloud_map" 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 a951e39697..15d20e46b7 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 @@ -169,7 +169,7 @@ Image: </text> <texture_picker - height="100" + height="123" layout="topleft" left_delta="5" name="sun_image" @@ -220,7 +220,7 @@ Image: </text> <texture_picker - height="100" + height="123" layout="topleft" left_delta="5" name="moon_image" diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index c24a2dbbb6..4c9ae57941 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -167,12 +167,12 @@ Normal Map </text> <texture_picker - height="75" + height="84" layout="topleft" left_delta="0" name="water_normal_map" top_pad="5" - width="75"/> + width="61"/> <text follows="left|top" @@ -196,7 +196,7 @@ min_val_y="-4" max_val_y="4" increment_y="0.5f" - arrow_color="red"/> + arrow_color="white"/> <text follows="left|top" @@ -218,7 +218,7 @@ max_val_x="4" min_val_y="-4" max_val_y="4" - arrow_color="green"/> + arrow_color="white"/> <text follows="left|top|right" |