diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-04-29 08:55:51 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-04-29 08:55:51 -0700 |
| commit | 598b547bcfeb21569a1eda8c272f6de665cf372e (patch) | |
| tree | e39591edb8727868751497e487bcc5864c6b5e0c /indra | |
| parent | 7c3a511935a16e0e99b8a5a57edd69a9290465a2 (diff) | |
| parent | 9ff19f4d50ed163c4b0ad4255ca618f27f98a3a3 (diff) | |
SL-14113 Resolve merge conflict
Diffstat (limited to 'indra')
| -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 1dcd9289ef..32329dfde8 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -1078,7 +1078,6 @@ BOOL LLViewerShaderMgr::loadShadersEnvironment() gMoonProgram.addConstant( LLGLSLShader::SHADER_CONST_MOON_DEPTH ); // SL-14113 success = gMoonProgram.createShader(NULL, NULL); if (success) - { gMoonProgram.bind(); gMoonProgram.uniform1i(sTex0, 0); |