diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-08-08 14:55:35 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-08-08 14:55:35 -0500 |
| commit | eeb3b4daa62d044d8fcdee1a2fa6a63c782b3229 (patch) | |
| tree | 3fab3689dbd2e0d74c7d139d8545d2c9884250e4 /indra/newview/skins/default/xui/en | |
| parent | 963566821d95d30856cd028983d929fab89f542a (diff) | |
| parent | 3e7946bbbf905418595b0632388fb3de4d673312 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_material_editor.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml index 74adc86126..0a05a4f868 100644 --- a/indra/newview/skins/default/xui/en/floater_material_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml @@ -111,6 +111,7 @@ layout="topleft" left_delta="0" top_pad="5" + min_val="0" max_val="1" name="transparency" width="64" @@ -169,6 +170,7 @@ layout="topleft" left_delta="0" top_pad="5" + min_val="0" max_val="1" name="alpha cutoff" width="64" @@ -245,6 +247,7 @@ layout="topleft" left_delta="0" top_pad="5" + min_val="0" max_val="1" name="metalness factor" width="64" @@ -270,7 +273,7 @@ layout="topleft" left_delta="0" top_pad="5" - + min_val="0" max_val="1" name="roughness factor" width="64" diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 8f2acc8df4..4700488197 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -820,7 +820,7 @@ width="282"/> <tab_container follows="left|top" - height="471" + height="476" halign="center" left="0" name="Object Info Tabs" @@ -2749,7 +2749,7 @@ even though the user gets a free copy. border_visible="true" bevel_style="in" follows="left|top|right" - height="335" + height="387" layout="topleft" left="10" name="contents_inventory" |