diff options
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index b8a06f4816..49af54d5aa 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -11,6 +11,7 @@ #include "llvosky.h" #include "imageids.h" +#include "llfeaturemanager.h" #include "llviewercontrol.h" #include "llframetimer.h" #include "timing.h" @@ -577,7 +578,7 @@ void LLVOSky::initCubeMap() { mCubeMap->init(images); } - else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap) + else if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap")) { mCubeMap = new LLCubeMap(); mCubeMap->init(images); @@ -614,7 +615,8 @@ void LLVOSky::restoreGL() calcBrightnessScaleAndColors(); - if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap) + if (gSavedSettings.getBOOL("RenderWater") && gGLManager.mHasCubeMap + && gFeatureManagerp->isFeatureAvailable("RenderCubeMap")) { LLCubeMap* cube_map = getCubeMap(); |