diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-11 08:09:32 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-11 08:09:32 +0100 |
| commit | 076d7db4acf2c1191bfcda8f8866fc3e71b11f93 (patch) | |
| tree | cb895b2412efab658b508cb8722fd7cf47876e6e /indra/newview/llvoavatar.cpp | |
| parent | e9faa58df73d18553ec56dfc17e60eea0e826017 (diff) | |
| parent | 0116400820d15f80a2d726a5b0e4311d27a100de (diff) | |
EXT-7464 Sandbox test of palmer/viewer-trunk (Deferred rendering turned off, but fixes merged in)
The merge.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 55814f86f8..c75ae7a06e 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4159,10 +4159,16 @@ void LLVOAvatar::addBakedTextureStats( LLViewerFetchedTexture* imagep, F32 pixel { mMaxPixelArea = llmax(pixel_area, mMaxPixelArea); mMinPixelArea = llmin(pixel_area, mMinPixelArea); + imagep->resetTextureStats(); + imagep->setResetMaxVirtualSizeFlag(false) ; imagep->setCanUseHTTP(false) ; //turn off http fetching for baked textures. imagep->addTextureStats(pixel_area / texel_area_ratio); imagep->setBoostLevel(boost_level); + if(boost_level == LLViewerTexture::BOOST_AVATAR_BAKED_SELF) + { + imagep->setAdditionalDecodePriority(1.0f) ; + } } //virtual |