Second Life viewer sources 1.15.1.3

1 files changed, 7 insertions, 4 deletions

diff --git a/linden/indra/newview/lldrawpoolavatar.cpp b/linden/indra/newview/lldrawpoolavatar.cpp
index debcfe2..b864449 100644
--- a/linden/indra/newview/lldrawpoolavatar.cpp
+++ b/linden/indra/newview/lldrawpoolavatar.cpp
@@ -102,7 +102,8 @@ BOOL gRenderAvatar = TRUE;
 
 S32 LLDrawPoolAvatar::getVertexShaderLevel() const
 {
-        return (S32) LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR);
+        return sShaderLevel;
+        //return (S32) LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR);
 }
 
 void LLDrawPoolAvatar::prerender()
@@ -197,20 +198,22 @@ void LLDrawPoolAvatar::endFootShadow()
 
 void LLDrawPoolAvatar::beginRigid()
 {
-        sVertexProgram = &gAvatarEyeballProgram;
+        sVertexProgram = NULL;
+        sShaderLevel = 0;
         glEnableClientState(GL_NORMAL_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
-        if (sShaderLevel > 0)
+        /*if (sShaderLevel > 0)
         {       //eyeballs render with the specular shader
                 gAvatarEyeballProgram.bind();
                 gMaterialIndex = gAvatarEyeballProgram.mAttribute[LLShaderMgr::MATERIAL_COLOR];
                 gSpecularIndex = gAvatarEyeballProgram.mAttribute[LLShaderMgr::SPECULAR_COLOR];
-        }
+        }*/
 }
 
 void LLDrawPoolAvatar::endRigid()
 {
+        sShaderLevel = mVertexShaderLevel;
         glDisableClientState(GL_NORMAL_ARRAY);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }