diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-11 01:21:12 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-11 01:21:12 +0300 |
| commit | 0f1d13fd4a8f1bbac74cc70234e90b6c08e45e9b (patch) | |
| tree | 858a8956eabe282f972f219a665d3ebbeea11e36 /indra/llrender | |
| parent | d66cd019b30ec6ab519fa0ea0c76c1beb99be74c (diff) | |
| parent | 4617e07b3795e46c2037462f738ab81b35bd7294 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 4 | ||||
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index b30bc1aed6..58c1186a3e 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -349,8 +349,8 @@ void LLGLSLShader::unloadInternal() for (GLsizei i = 0; i < count; i++) { glDetachObjectARB(mProgramObject, obj[i]); - glDeleteObjectARB(obj[i]); - } + glDeleteObjectARB(obj[i]); + } glDeleteObjectARB(mProgramObject); diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index b297223c2e..55f0791174 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -520,7 +520,7 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns, const std::string& if (!filename.empty()) { LL_CONT << "From " << filename << ":\n"; - } + } LL_CONT << log << LL_ENDL; } } |