SG1.4: fix ressource waste in non-wl sky rendering

1 files changed, 9 insertions, 14 deletions

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 14896e1..f10aca5 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -1417,20 +1417,15 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
 
         camera.disableUserClipPlane();
 
-        if (gSky.mVOSkyp.notNull() && gSky.mVOSkyp->mDrawable.notNull())
-        {
-                // Hack for sky - always visible.
-                if (hasRenderType(LLPipeline::RENDER_TYPE_SKY)) 
-                {
-                        gSky.mVOSkyp->mDrawable->setVisible(camera);
-                        sCull->pushDrawable(gSky.mVOSkyp->mDrawable);
-                        gSky.updateCull();
-                        stop_glerror();
-                }
-        }
-        else
-        {
-                llinfos << "No sky drawable!" << llendl;
+        // Render non-windlight sky.
+        if (hasRenderType(LLPipeline::RENDER_TYPE_SKY) &&
+            gSky.mVOSkyp.notNull() &&
+            gSky.mVOSkyp->mDrawable.notNull())
+        {
+                gSky.mVOSkyp->mDrawable->setVisible(camera);
+                sCull->pushDrawable(gSky.mVOSkyp->mDrawable);
+                gSky.updateCull();
+                stop_glerror();
         }
 
         if (hasRenderType(LLPipeline::RENDER_TYPE_GROUND) &&