From e61a10ec5b6b84fcb5c27e8e308022d0094f8736 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 4 Jun 2007 18:46:59 +0000
Subject: svn merge -r 62602:62831
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
---
indra/newview/llvosky.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'indra/newview/llvosky.cpp')
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 9da6027ab5..aa4c6f0086 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -518,8 +518,6 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
mSun.setIntensity(SUN_INTENSITY);
mMoon.setIntensity(0.1f * SUN_INTENSITY);
- mCubeMap = NULL;
-
mSunTexturep = gImageList.getImage(gSunTextureID, TRUE, TRUE);
mSunTexturep->setClamp(TRUE, TRUE);
mMoonTexturep = gImageList.getImage(gMoonTextureID, TRUE, TRUE);
@@ -534,7 +532,6 @@ LLVOSky::~LLVOSky()
// Don't delete images - it'll get deleted by gImageList on shutdown
// This needs to be done for each texture
- delete mCubeMap;
mCubeMap = NULL;
}
@@ -576,7 +573,7 @@ void LLVOSky::initCubeMap()
{
images.push_back(mSkyTex[side].getImageRaw());
}
- if (mCubeMap != NULL)
+ if (mCubeMap)
{
mCubeMap->init(images);
}
--
cgit v1.2.3