diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
| commit | d5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch) | |
| tree | de0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/newview/llcolorswatch.cpp | |
| parent | c4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff) | |
| parent | 71dc13aac99458989776e93c38294f507074fce4 (diff) | |
Almost automated merge
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index 7b75c77a1e..ed304bdd34 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -228,7 +228,8 @@ void LLColorSwatchCtrl::draw() { if (!mFallbackImageName.empty()) { - LLPointer<LLViewerTexture> fallback_image = LLViewerTextureManager::getFetchedTextureFromFile(mFallbackImageName, TRUE, FALSE, LLViewerTexture::LOD_TEXTURE); + LLPointer<LLViewerTexture> fallback_image = LLViewerTextureManager::getFetchedTextureFromFile(mFallbackImageName, TRUE, + LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); if( fallback_image->getComponents() == 4 ) { gl_rect_2d_checkerboard( interior ); |