SH-3230 Disable texture readback & upload

If we're utilizing server-side texture baking, upload requests are
discarded.

Note: this breaks viewer in that it will *always* use the baked textures
sent by the cache request/ initial login. Without a server-generated
update, you will see those textures on your avatar for the entire session,
even if you switch outfits.

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 0bfd0df769..ee3381a5ad 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -887,7 +887,10 @@ void LLVOAvatarSelf::removeMissingBakedTextures()
 			invalidateComposite(mBakedTextureDatas[i].mTexLayerSet, FALSE);
 		}
 		updateMeshTextures();
-		requestLayerSetUploads();
+		if (!LLAppearanceMgr::instance().useServerTextureBaking())
+		{
+			requestLayerSetUploads();
+		}
 	}
 }
 
@@ -1630,7 +1633,7 @@ void LLVOAvatarSelf::invalidateComposite( LLTexLayerSet* layerset, BOOL upload_r
 	layerset->requestUpdate();
 	layerset->invalidateMorphMasks();
 
-	if( upload_result )
+	if( upload_result  && !LLAppearanceMgr::instance().useServerTextureBaking())
 	{
 		llassert(isSelf());