diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 12:42:32 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 12:42:32 -0700 |
| commit | 1f5f0a4b060ca22ccc6b5764cb8f947d68ec87e2 (patch) | |
| tree | 240f028339bc20371e73bda0161c5e5b44a6f6e8 /indra/newview/skins/default/xui | |
| parent | 792f606093daf89873342d3465eda296e329d407 (diff) | |
| parent | 29246e8a1fa1f8ebec307cc32017910d1e4ab5f4 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 10 |
1 files changed, 5 insertions, 5 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 678b4f43cd..a5425062ec 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -2,7 +2,7 @@ <panel border="false" follows="all" - height="400" + height="420" label="Texture" layout="topleft" left="0" @@ -139,7 +139,7 @@ <texture_picker can_apply_immediately="true" default_image_name="Default" - fallback_image="locked_image.j2c" + fallback_image="materials_ui_x_24.png" follows="left|top" height="80" label="Texture " @@ -216,7 +216,7 @@ allow_no_texture="true" can_apply_immediately="true" default_image_name="Default" - fallback_image="locked_image.j2c" + fallback_image="materials_ui_x_24.png" follows="left|top" height="80" label="Texture " @@ -327,7 +327,7 @@ allow_no_texture="true" can_apply_immediately="true" default_image_name="Default" - fallback_image="locked_image.j2c" + fallback_image="materials_ui_x_24.png" follows="left|top" height="80" label="Texture " @@ -743,7 +743,7 @@ left="7" name="checkbox planar align" tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping." - top_delta="26" + top_delta="16" width="260" /> <web_browser visible="false" |