diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-04-29 14:20:04 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-04-29 14:20:04 -0700 |
| commit | 8fc6fcc0a6f1427e58ea35e5cab53af6f79f1be4 (patch) | |
| tree | 2def8572891901526e41b84e2780725db25db527 | |
| parent | d3c439b3743490ee22d5356ec3b61cb13c86f487 (diff) | |
| parent | 22f67f9913bad7934a95679318a4bc48444cedaa (diff) | |
SL-14113: Fix remote merge conflict
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 0c1ba13bb1..43e9a2333e 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1078,7 +1078,6 @@ BOOL LLViewerShaderMgr::loadShadersEnvironment() gMoonProgram.addConstant( LLGLSLShader::SHADER_CONST_CLOUD_MOON_DEPTH ); // SL-14113 success = gMoonProgram.createShader(NULL, NULL); if (success) - { gMoonProgram.bind(); gMoonProgram.uniform1i(sTex0, 0); |