From 089fc07d207c71ce1401e72f09c31ad8c45872e2 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:44:58 -0500 Subject: Second Life viewer sources 1.17.0.12 --- linden/indra/newview/llvosky.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'linden/indra/newview/llvosky.cpp') diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp index 68fee1a..2d31bf4 100644 --- a/linden/indra/newview/llvosky.cpp +++ b/linden/indra/newview/llvosky.cpp @@ -538,8 +538,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); @@ -554,7 +552,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; } @@ -596,7 +593,7 @@ void LLVOSky::initCubeMap() { images.push_back(mSkyTex[side].getImageRaw()); } - if (mCubeMap != NULL) + if (mCubeMap) { mCubeMap->init(images); } -- cgit v1.1