1 files changed, 11 insertions, 3 deletions

diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp
index dde2193..e796d56 100644
--- a/linden/indra/newview/lldrawpoolwater.cpp
+++ b/linden/indra/newview/lldrawpoolwater.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -567,7 +567,15 @@ void LLDrawPoolWater::shade()
         LLCubeMap* skyMap = gSky.mVOSkyp->getCubeMap();
         
         gWaterProgram.enableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
-        skyMap->bind();
+
+        if (skyMap)
+        {
+                skyMap->bind();
+        }
+        else
+        {
+                llwarns << "NULL gSky.mVOSkyp->getCubeMap(), not binding." << llendl;
+        }
 
         //bind normal map
         S32 bumpTex = gWaterProgram.enableTexture(LLShaderMgr::BUMP_MAP);