diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-10-05 15:50:37 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-10-05 15:50:37 +0000 |
| commit | 863dc917ac1fc9ea4342c130a1f79c137e525c1a (patch) | |
| tree | acbe5f9d22520de264beda552d16b2c47265cb34 /indra/newview | |
| parent | 107994a68ff556d0ab7213795fe31bf724bc599c (diff) | |
| parent | 4f9d8f555efe04924a7730d3c91faaae3ea56825 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #130)
SL-9809
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/windlight/corona_lut.png | bin | 0 -> 6129 bytes | |||
| -rw-r--r-- | indra/newview/app_settings/windlight/rainbow_lut.png | bin | 0 -> 200088 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/windlight/corona_lut.png b/indra/newview/app_settings/windlight/corona_lut.png Binary files differnew file mode 100644 index 0000000000..c4843667d9 --- /dev/null +++ b/indra/newview/app_settings/windlight/corona_lut.png diff --git a/indra/newview/app_settings/windlight/rainbow_lut.png b/indra/newview/app_settings/windlight/rainbow_lut.png Binary files differnew file mode 100644 index 0000000000..4bede25649 --- /dev/null +++ b/indra/newview/app_settings/windlight/rainbow_lut.png 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 fd9933f69f..6d12f6bb94 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 @@ -148,7 +148,7 @@ layout="topleft" left_delta="5" min_val="0" - max_val="2" + max_val="1.99" name="glow_size" top_delta="15" width="250" |
