diff options
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 7bbaf48..9937ed9 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -5129,12 +5129,6 @@ void LLVOAvatar::updateTextures() | |||
5129 | if (texture_dict->mIsLocalTexture) | 5129 | if (texture_dict->mIsLocalTexture) |
5130 | { | 5130 | { |
5131 | addLocalTextureStats((ETextureIndex)index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]); | 5131 | addLocalTextureStats((ETextureIndex)index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]); |
5132 | // SNOW-8 : temporary snowglobe1.0 fix for baked textures | ||
5133 | if (render_avatar && !gGLManager.mIsDisabled ) | ||
5134 | { | ||
5135 | // bind the texture so that its boost level won't be slammed | ||
5136 | gGL.getTexUnit(0)->bind(imagep); | ||
5137 | } | ||
5138 | } | 5132 | } |
5139 | else if (texture_dict->mIsBakedTexture) | 5133 | else if (texture_dict->mIsBakedTexture) |
5140 | { | 5134 | { |
@@ -5171,8 +5165,14 @@ void LLVOAvatar::addLocalTextureStats( ETextureIndex idx, LLViewerImage* imagep, | |||
5171 | F32 desired_pixels; | 5165 | F32 desired_pixels; |
5172 | if( mIsSelf ) | 5166 | if( mIsSelf ) |
5173 | { | 5167 | { |
5174 | desired_pixels = llmin(mPixelArea, (F32)TEX_IMAGE_AREA_SELF ); | 5168 | desired_pixels = llmax(mPixelArea, (F32)TEX_IMAGE_AREA_SELF ); |
5175 | imagep->setBoostLevel(LLViewerImageBoostLevel::BOOST_AVATAR_SELF); | 5169 | imagep->setBoostLevel(LLViewerImageBoostLevel::BOOST_AVATAR_SELF); |
5170 | // SNOW-8 : temporary snowglobe1.0 fix for baked textures | ||
5171 | if (render_avatar && !gGLManager.mIsDisabled ) | ||
5172 | { | ||
5173 | // bind the texture so that its boost level won't be slammed | ||
5174 | gGL.getTexUnit(0)->bind(imagep); | ||
5175 | } | ||
5176 | } | 5176 | } |
5177 | else | 5177 | else |
5178 | { | 5178 | { |