diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 20:17:12 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 20:17:12 -0400 |
| commit | e743a56b14448916895a22a2beb368e75f58650d (patch) | |
| tree | 2639fa61782436989ba90c1cc6e64e8a90d007dd /indra/llrender/llshadermgr.cpp | |
| parent | 73f474d886d2430db3d5c8f7729f769b389730a4 (diff) | |
| parent | b864cecd6c938b18cf05f7695f33f4da3b608a47 (diff) | |
Merge. Pull a fix from viewer-cat that went in after last merge.
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 825f80a6dc..4893b1d043 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1120,8 +1120,6 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("matrixPalette"); - - mReservedUniforms.reserve(12); mReservedUniforms.push_back("screenTex"); mReservedUniforms.push_back("screenDepth"); mReservedUniforms.push_back("refTex"); |