From ccf5b667663b01c724014f19c28022498d1b3bb6 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sun, 17 Oct 2010 23:50:42 +0200
Subject: Ask for at least 512^2 pixels of local texture before bake

Not sure this helps with non-baking, but it looked wrong.
Also, only bind local texture before they are covered by a bake.
---
 linden/indra/newview/llvoavatar.cpp | 14 +++++++-------
 1 file 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()
 				if (texture_dict->mIsLocalTexture)
 				{
 					addLocalTextureStats((ETextureIndex)index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]);
-					// SNOW-8 : temporary snowglobe1.0 fix for baked textures
-					if (render_avatar && !gGLManager.mIsDisabled )
-					{
-						// bind the texture so that its boost level won't be slammed
-						gGL.getTexUnit(0)->bind(imagep);
-					}
 				}
 				else if (texture_dict->mIsBakedTexture)
 				{
@@ -5171,8 +5165,14 @@ void LLVOAvatar::addLocalTextureStats( ETextureIndex idx, LLViewerImage* imagep,
 			F32 desired_pixels;
 			if( mIsSelf )
 			{
-				desired_pixels = llmin(mPixelArea, (F32)TEX_IMAGE_AREA_SELF );
+				desired_pixels = llmax(mPixelArea, (F32)TEX_IMAGE_AREA_SELF );
 				imagep->setBoostLevel(LLViewerImageBoostLevel::BOOST_AVATAR_SELF);
+				// SNOW-8 : temporary snowglobe1.0 fix for baked textures
+				if (render_avatar && !gGLManager.mIsDisabled )
+				{
+					// bind the texture so that its boost level won't be slammed
+					gGL.getTexUnit(0)->bind(imagep);
+				}
 			}
 			else
 			{
-- 
cgit v1.1