2 files changed, 11 insertions, 10 deletions

diff --git a/linden/indra/llrender/llglslshader.cpp b/linden/indra/llrender/llglslshader.cpp
index 08d6548..429cf6f 100644
--- a/linden/indra/llrender/llglslshader.cpp
+++ b/linden/indra/llrender/llglslshader.cpp
@@ -160,7 +160,9 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes,
 
 BOOL LLGLSLShader::attachObject(std::string object)
 {
-        if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)
+        //if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)
+    std::map<std::string, GLhandleARB> &ShaderObjects = LLShaderMgr::instance()->mShaderObjects; 
+    if (ShaderObjects.find(object) != ShaderObjects.end()) 
         {
                 stop_glerror();
                 glAttachObjectARB(mProgramObject, LLShaderMgr::instance()->mShaderObjects[object]);
diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp
index 451d08e..46de496 100644
--- a/linden/indra/newview/lldrawpoolwlsky.cpp
+++ b/linden/indra/newview/lldrawpoolwlsky.cpp
@@ -276,18 +276,17 @@ void LLDrawPoolWLSky::render(S32 pass)
         LLVector3 const & origin = LLViewerCamera::getInstance()->getOrigin();
         glPushMatrix();
 
-                glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
+        glTranslatef(origin.mV[0], origin.mV[1], origin.mV[2]);
 
-                // *NOTE: have to bind a texture here since register combiners blending in
-                // renderStars() requires something to be bound and we might as well only
-                // bind the moon's texture once.
-                LLImageGL * tex  = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture();
-                gGL.getTexUnit(0)->bind(tex);
+        // *NOTE: have to bind a texture here since register combiners blending in
+        // renderStars() requires something to be bound and we might as well only
+        // bind the moon's texture once.
+        LLImageGL * tex  = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture();
+        gGL.getTexUnit(0)->bind(tex);
 
-                renderHeavenlyBodies();
+        renderStars();
 
-                renderStars();
-                
+        renderHeavenlyBodies();
 
         glPopMatrix();