diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 15:22:34 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 15:22:34 -0400 |
commit | 7203162071163108cbbb18f90ddb7f5d6734f8bd (patch) | |
tree | 698966629d29e71f77777c75331aeac272e0371a /indra/llrender/llshadermgr.cpp | |
parent | 31d3d654f156351e3cf29f97fd97cbda046ae650 (diff) | |
parent | 1bbc523b048628630e0a45f67f15cdf39cb138d9 (diff) |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |