diff options
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/textures/materials_ui_x_24.png | bin | 0 -> 602 bytes | |||
| -rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 10 |
3 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/skins/default/textures/materials_ui_x_24.png b/indra/newview/skins/default/textures/materials_ui_x_24.png Binary files differnew file mode 100644 index 0000000000..6d88554914 --- /dev/null +++ b/indra/newview/skins/default/textures/materials_ui_x_24.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index fcab966dee..b0e4b71d21 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -743,6 +743,7 @@ with the same filename but different name <texture name="default_land_picture.j2c" /> <texture name="default_profile_picture.j2c" /> <texture name="locked_image.j2c" /> + <texture name="materials_ui_x_24.png" /> <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" /> <texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" /> 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" |
