diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-10-02 14:19:16 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-10-02 14:19:16 -0500 |
| commit | 942df58666407b405ed4f82e05dea19dcc1a9f18 (patch) | |
| tree | a18ddf43684f9a7099ee4ed9c58ca16bd59d78ec /indra/newview/llviewershadermgr.cpp | |
| parent | bc4e90ea5e462662f90c860d69aaa53b88f189c5 (diff) | |
| parent | 153bd41bebae9f41e7c5e88dc54526eee152f6cf (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 82b16d67bd..d52f0b68fa 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2286,12 +2286,12 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() if (local_light_kill) { gDeferredSoftenWaterProgram.addPermutation("LOCAL_LIGHT_KILL", "1"); - gDeferredSoftenWaterProgram.addPermutation("HAS_SSAO", "1"); } if (gSavedSettings.getBOOL("RenderDeferredSSAO")) { //if using SSAO, take screen space light map into account as if shadows are enabled gDeferredSoftenWaterProgram.mShaderLevel = llmax(gDeferredSoftenWaterProgram.mShaderLevel, 2); + gDeferredSoftenWaterProgram.addPermutation("HAS_SSAO", "1"); } success = gDeferredSoftenWaterProgram.createShader(NULL, NULL); |