From 1a07a4b693169d34150ad06d4aeb904e19dc7667 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Thu, 13 Jan 2011 05:43:28 +0100 Subject: [PATCH] Shyotl's ATI sky fix --- indra/llrender/llglslshader.cpp | 3 ++- indra/newview/lldrawpoolwlsky.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 08d654805..933da8ab7 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -160,7 +160,8 @@ BOOL LLGLSLShader::createShader(vector * attributes, BOOL LLGLSLShader::attachObject(std::string object) { - if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0) + std::map &ShaderObjects = LLShaderMgr::instance()->mShaderObjects; + if (ShaderObjects.find(object) != ShaderObjects.end()) { stop_glerror(); glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]); diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index a16b4b079..c32ee428c 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -284,9 +284,9 @@ void LLDrawPoolWLSky::render(S32 pass) LLImageGL * tex = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture(); gGL.getTexUnit(0)->bind(tex); - renderHeavenlyBodies(); - renderStars(); + + renderHeavenlyBodies(); glPopMatrix();