Second Life viewer sources 1.19.1.2

1 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 987e65e..0bfb737 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -73,7 +73,7 @@ const U32 VERTEX_MASK_SHINY = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_N
 const U32 VERTEX_MASK_BUMP = LLVertexBuffer::MAP_VERTEX |LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_TEXCOORD2;
 
 U32 LLDrawPoolBump::sVertexMask = VERTEX_MASK_SHINY;
-static LLCubeMap* sCubeMap = NULL;
+static LLPointer<LLCubeMap> sCubeMap;
 
 static LLGLSLShader* shader = NULL;
 static S32 cube_channel = -1;
@@ -592,7 +592,7 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL
                                 {
                                         sCubeMap->bind();
                                 }
-                                else
+                                else if (gSky.mVOSkyp->getCubeMap())
                                 {
                                         gSky.mVOSkyp->getCubeMap()->bind();
                                 }