diff options
| author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
| commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
| tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llvosky.cpp | |
| parent | Second Life viewer sources 1.20.15 (diff) | |
| download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz | |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llvosky.cpp')
| -rw-r--r-- | linden/indra/newview/llvosky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp index eae322e..60f674e 100644 --- a/linden/indra/newview/llvosky.cpp +++ b/linden/indra/newview/llvosky.cpp | |||
| @@ -441,7 +441,7 @@ void LLVOSky::initCubeMap() | |||
| 441 | { | 441 | { |
| 442 | mCubeMap->init(images); | 442 | mCubeMap->init(images); |
| 443 | } | 443 | } |
| 444 | else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")) | 444 | else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps) |
| 445 | { | 445 | { |
| 446 | mCubeMap = new LLCubeMap(); | 446 | mCubeMap = new LLCubeMap(); |
| 447 | mCubeMap->init(images); | 447 | mCubeMap->init(images); |
| @@ -479,7 +479,7 @@ void LLVOSky::restoreGL() | |||
| 479 | calcAtmospherics(); | 479 | calcAtmospherics(); |
| 480 | 480 | ||
| 481 | if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap | 481 | if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap |
| 482 | && LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap")) | 482 | && LLCubeMap::sUseCubeMaps) |
| 483 | { | 483 | { |
| 484 | LLCubeMap* cube_map = getCubeMap(); | 484 | LLCubeMap* cube_map = getCubeMap(); |
| 485 | 485 | ||