diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-04-03 23:49:53 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-04-03 23:49:53 -0500 |
| commit | 57b371ab9b5d55b41f3760b48e5e0b0aa906be57 (patch) | |
| tree | 73a8991d5a0cf6ccc7f0953435a3e4c23e1ed218 /indra/newview/skins | |
| parent | e280422d4454549e4fd992ad45ec2ea4d41b08eb (diff) | |
| parent | 7a820b88fc45a4a16573387782e1c3f7e412da68 (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index e156b3e07c..5e2caa28a9 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -209,9 +209,11 @@ layout="topleft" top_pad="4" left_delta="0" + increment="1" name="maskcutoff" width="80" /> <texture_picker + allow_no_texture="true" can_apply_immediately="true" default_image_name="Default" fallback_image="locked_image.j2c" @@ -322,6 +324,7 @@ value="Use texture" /> </combo_box> <texture_picker + allow_no_texture="true" can_apply_immediately="true" default_image_name="Default" fallback_image="locked_image.j2c" |