diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-19 16:50:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-19 16:50:08 -0400 |
| commit | 7ffc8b45e2cee4389d3b9f3c20ae213e6430d57b (patch) | |
| tree | 2095b3a3d55990e7a534fee31226c3caa096c699 /indra/newview/lldrawpoolbump.cpp | |
| parent | f40d2c5afb78f4a17b4753c42f6756dbd76a18c8 (diff) | |
| parent | 2b40cbb13d03d2e55eb7540f5f59856fb3e6a9cc (diff) | |
merge changes for storm-1564
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index d801f6df18..6f71c54f79 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -1073,8 +1073,8 @@ LLViewerTexture* LLBumpImageList::getBrightnessDarknessImage(LLViewerFetchedText if (!src_image->hasCallbacks()) { //if image has no callbacks but resolutions don't match, trigger raw image loaded callback again if (src_image->getWidth() != bump->getWidth() || - src_image->getHeight() != bump->getHeight() || - (LLPipeline::sRenderDeferred && bump->getComponents() != 4)) + src_image->getHeight() != bump->getHeight())// || + //(LLPipeline::sRenderDeferred && bump->getComponents() != 4)) { src_image->setBoostLevel(LLViewerTexture::BOOST_BUMP) ; src_image->setLoadedCallback( callback_func, 0, TRUE, FALSE, new LLUUID(src_image->getID()), NULL ); |