diff options
author | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
commit | 089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch) | |
tree | 0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/newview/llvosky.cpp | |
parent | Second Life viewer sources 1.16.0.5 (diff) | |
download | meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2 meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz |
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/newview/llvosky.cpp')
-rw-r--r-- | linden/indra/newview/llvosky.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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) | |||
538 | mSun.setIntensity(SUN_INTENSITY); | 538 | mSun.setIntensity(SUN_INTENSITY); |
539 | mMoon.setIntensity(0.1f * SUN_INTENSITY); | 539 | mMoon.setIntensity(0.1f * SUN_INTENSITY); |
540 | 540 | ||
541 | mCubeMap = NULL; | ||
542 | |||
543 | mSunTexturep = gImageList.getImage(gSunTextureID, TRUE, TRUE); | 541 | mSunTexturep = gImageList.getImage(gSunTextureID, TRUE, TRUE); |
544 | mSunTexturep->setClamp(TRUE, TRUE); | 542 | mSunTexturep->setClamp(TRUE, TRUE); |
545 | mMoonTexturep = gImageList.getImage(gMoonTextureID, TRUE, TRUE); | 543 | mMoonTexturep = gImageList.getImage(gMoonTextureID, TRUE, TRUE); |
@@ -554,7 +552,6 @@ LLVOSky::~LLVOSky() | |||
554 | // Don't delete images - it'll get deleted by gImageList on shutdown | 552 | // Don't delete images - it'll get deleted by gImageList on shutdown |
555 | // This needs to be done for each texture | 553 | // This needs to be done for each texture |
556 | 554 | ||
557 | delete mCubeMap; | ||
558 | mCubeMap = NULL; | 555 | mCubeMap = NULL; |
559 | } | 556 | } |
560 | 557 | ||
@@ -596,7 +593,7 @@ void LLVOSky::initCubeMap() | |||
596 | { | 593 | { |
597 | images.push_back(mSkyTex[side].getImageRaw()); | 594 | images.push_back(mSkyTex[side].getImageRaw()); |
598 | } | 595 | } |
599 | if (mCubeMap != NULL) | 596 | if (mCubeMap) |
600 | { | 597 | { |
601 | mCubeMap->init(images); | 598 | mCubeMap->init(images); |
602 | } | 599 | } |