diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
| commit | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (patch) | |
| tree | 529ce1546477d9620c18095ab73e54bbd7ea8d90 /indra/newview/skins | |
| parent | 7781e1417e5a747a501e76ee9e976226a2656b6a (diff) | |
| parent | eb6c8c937e214f58cc4da48bd4db455315de4c20 (diff) | |
Merged in DV510-merge-6.4.10 (pull request #322)
Merge master v 6.4.10 to DRTVWR-510
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 873b95926b..5fa1847d1b 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1733,6 +1733,16 @@ function="World.EnvPreset" parameter="character" /> </menu_item_check> <menu_item_check + label="Animeshes" + name="Rendering Type Control Avatar"> + <menu_item_check.on_check + function="Advanced.CheckRenderType" + parameter="controlAV" /> + <menu_item_check.on_click + function="Advanced.ToggleRenderType" + parameter="controlAV" /> + </menu_item_check> + <menu_item_check label="Surface Patch" name="Rendering Type Surface Patch" shortcut="control|alt|shift|5"> 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 bec793bbee..6f82a0efa1 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 @@ -203,10 +203,10 @@ Ice Level: </text> <slider - decimal_digits="1" + decimal_digits="3" follows="left|top" height="14" - increment="0.1" + increment="0.001" initial_value="0" left_delta="5" top_delta="20" |