From 43fd687b7c8ac3668406a80e6c2e9642c3d7cfdc Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 13 Jun 2011 23:20:45 -0500 Subject: [PATCH] Fixed nullptr call on shutdown. --- indra/llrender/llrender.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index b10c77c1a..552814c7e 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -307,6 +307,11 @@ bool LLTexUnit::bind(LLCubeMap* cubeMap) return false; } + if (cubeMap->mImages[0].isNull()) + { + llwarns << "NULL LLTexUnit::bind cubeMap->mImages[0]" << llendl; + return false; + } if (mCurrTexture != cubeMap->mImages[0]->getTexName()) { if (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)