diff options
| author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
| commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
| tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/newview/lldrawpoolwater.cpp | |
| parent | Second Life viewer sources 1.18.2.1 (diff) | |
| download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz | |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/lldrawpoolwater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp index 100eb43..035cb56 100644 --- a/linden/indra/newview/lldrawpoolwater.cpp +++ b/linden/indra/newview/lldrawpoolwater.cpp | |||
| @@ -92,8 +92,8 @@ LLDrawPool *LLDrawPoolWater::instancePool() | |||
| 92 | 92 | ||
| 93 | void LLDrawPoolWater::prerender() | 93 | void LLDrawPoolWater::prerender() |
| 94 | { | 94 | { |
| 95 | mVertexShaderLevel = gSavedSettings.getBOOL("RenderRippleWater") ? | 95 | mVertexShaderLevel = (gSavedSettings.getBOOL("RenderRippleWater") && gGLManager.mHasCubeMap && gFeatureManagerp->isFeatureAvailable("RenderCubeMap")) ? |
| 96 | LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) : 0; | 96 | LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_ENVIRONMENT) : 0; |
| 97 | 97 | ||
| 98 | } | 98 | } |
| 99 | 99 | ||
| @@ -565,7 +565,7 @@ void LLDrawPoolWater::shade() | |||
| 565 | LLCubeMap* skyMap = gSky.mVOSkyp->getCubeMap(); | 565 | LLCubeMap* skyMap = gSky.mVOSkyp->getCubeMap(); |
| 566 | 566 | ||
| 567 | gWaterProgram.enableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB); | 567 | gWaterProgram.enableTexture(LLShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB); |
| 568 | skyMap->bind(); | 568 | skyMap->bind(); |
| 569 | 569 | ||
| 570 | //bind normal map | 570 | //bind normal map |
| 571 | S32 bumpTex = gWaterProgram.enableTexture(LLShaderMgr::BUMP_MAP); | 571 | S32 bumpTex = gWaterProgram.enableTexture(LLShaderMgr::BUMP_MAP); |