From cd582e3364c012aed3e87d2bd4dfacad761b015c Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 17 Feb 2011 16:06:34 -0600
Subject: SH-547 Use appropriate texture channel for rendering avatars into
 their impostor map.

---
 indra/newview/lldrawpoolavatar.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index ae3421a019..fbf39ee91e 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1030,6 +1030,7 @@ void LLDrawPoolAvatar::beginDeferredSkinned()
 
 	sVertexProgram->bind();
 	
+	sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 	enable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]);
 
 	gGL.getTexUnit(0)->activate();
@@ -1042,6 +1043,8 @@ void LLDrawPoolAvatar::endDeferredSkinned()
 	disable_vertex_weighting(sVertexProgram->mAttribute[LLViewerShaderMgr::AVATAR_WEIGHT]);
 	sVertexProgram->unbind();
 
+	sVertexProgram->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
+
 	sShaderLevel = mVertexShaderLevel;
 
 	gGL.getTexUnit(0)->activate();
-- 
cgit v1.2.3