diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
commit | 270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch) | |
tree | 5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/newview/llface.cpp | |
parent | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff) | |
parent | 6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff) |
merge from remote repo
Diffstat (limited to 'indra/newview/llface.cpp')
-rw-r--r-- | indra/newview/llface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 09b3ce1e86..8ec448e281 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -515,8 +515,8 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color) /* removed in lieu of raycast uv detection void LLFace::renderSelectedUV() { - LLViewerTexture* red_blue_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test1.j2c", TRUE, TRUE); - LLViewerTexture* green_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test2.tga", TRUE, TRUE); + LLViewerTexture* red_blue_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test1.j2c", TRUE, LLViewerTexture::BOOST_UI); + LLViewerTexture* green_imagep = LLViewerTextureManager::getFetchedTextureFromFile("uv_test2.tga", TRUE, LLViewerTexture::BOOST_UI); LLGLSUVSelect object_select; |