diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2010-02-11 18:02:43 -0800 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2010-02-11 18:02:43 -0800 |
commit | a5c725c189254388af06bdee7317774bc0264940 (patch) | |
tree | 4860d9535b0d4e529c7799826bc5675e6f5348ba /indra/newview/llvovolume.cpp | |
parent | f791d103c85fdb1a8b5f9f32365708915d1cfe74 (diff) | |
parent | e0e82c908dd7aef7a0d3010be4bbc9fa1ac4d32a (diff) |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index bfe38c14ba..fa00396c34 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -679,6 +679,7 @@ void LLVOVolume::updateTextureVirtualSize() vsize = area; imagep->setBoostLevel(LLViewerTexture::BOOST_HUD); face->setPixelArea(area); // treat as full screen + face->setVirtualSize(vsize); } else { @@ -695,8 +696,7 @@ void LLVOVolume::updateTextureVirtualSize() gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD, FALSE); } } - - face->setVirtualSize(vsize); + if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_AREA)) { if (vsize < min_vsize) min_vsize = vsize; |