diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
commit | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (patch) | |
tree | 623156a93d159ece460a31590701d7cbdc701cdc /indra/newview/lldrawpoolsky.cpp | |
parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (diff) | |
parent | 2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (diff) |
merge
Diffstat (limited to 'indra/newview/lldrawpoolsky.cpp')
-rw-r--r-- | indra/newview/lldrawpoolsky.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp index efffb2df9e..d1c8fa5fc9 100644 --- a/indra/newview/lldrawpoolsky.cpp +++ b/indra/newview/lldrawpoolsky.cpp @@ -84,7 +84,7 @@ void LLDrawPoolSky::render(S32 pass) } else if (LLGLSLShader::sNoFixedFunction) { //just use the UI shader (generic single texture no lighting) - gUIProgram.bind(); + gOneTextureNoColorProgram.bind(); } else { @@ -118,7 +118,7 @@ void LLDrawPoolSky::render(S32 pass) S32 face_count = (S32)mDrawFace.size(); LLVertexBuffer::unbind(); - glColor4f(1,1,1,1); + gGL.diffuseColor4f(1,1,1,1); for (S32 i = 0; i < llmin(6, face_count); ++i) { @@ -146,7 +146,7 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side) LLGLEnable blend(GL_BLEND); mSkyTex[side].bindTexture(FALSE); - glColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled + gGL.diffuseColor4f(1, 1, 1, LLSkyTex::getInterpVal()); // lighting is disabled face.renderIndexed(); } } |