From 941cb9f4124c9ccfd5c845bc94639fa46df12c3d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 1 Apr 2008 17:45:04 +0000 Subject: merge release@83343 skinning-1-merge@83714 -> release QAR-424 --- indra/newview/llface.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/newview/llface.cpp') diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 3e8d518c02..2157b50eb5 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -471,10 +471,8 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color, const S32 void LLFace::renderSelectedUV(const S32 offset, const S32 count) { #if 0 - LLUUID uv_img_red_blue_id(gViewerArt.getString("uv_test1.tga")); - LLUUID uv_img_green_id(gViewerArt.getString("uv_test2.tga")); - LLViewerImage* red_blue_imagep = gImageList.getImage(uv_img_red_blue_id, TRUE, TRUE); - LLViewerImage* green_imagep = gImageList.getImage(uv_img_green_id, TRUE, TRUE); + LLViewerImage* red_blue_imagep = gImageList.getImageFromFile("uv_test1.j2c", TRUE, TRUE); + LLViewerImage* green_imagep = gImageList.getImageFromFile("uv_test2.tga", TRUE, TRUE); LLGLSObjectSelect object_select; LLGLEnable blend(GL_BLEND); -- cgit v1.2.3