Second Life viewer sources 1.21.0-RC

1 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp
index 01e1af0..8802c1f 100644
--- a/linden/indra/newview/lldrawpoolwlsky.cpp
+++ b/linden/indra/newview/lldrawpoolwlsky.cpp
@@ -55,7 +55,7 @@ LLPointer<LLImageRaw> LLDrawPoolWLSky::sCloudNoiseRawImage = NULL;
 LLDrawPoolWLSky::LLDrawPoolWLSky(void) :
         LLDrawPool(POOL_WL_SKY)
 {
-        const LLString cloudNoiseFilename(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", "clouds2.tga"));
+        const std::string cloudNoiseFilename(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", "clouds2.tga"));
         llinfos << "loading WindLight cloud noise from " << cloudNoiseFilename << llendl;
 
         LLPointer<LLImageFormatted> cloudNoiseFile(LLImageFormatted::createFromExtension(cloudNoiseFilename));
@@ -78,7 +78,8 @@ LLDrawPoolWLSky::LLDrawPoolWLSky(void) :
 LLDrawPoolWLSky::~LLDrawPoolWLSky()
 {
         //llinfos << "destructing wlsky draw pool." << llendl;
-        sCloudNoiseTexture = 0;
+        sCloudNoiseTexture = NULL;
+        sCloudNoiseRawImage = NULL;
 }
 
 LLViewerImage *LLDrawPoolWLSky::getDebugTexture()