diff options
author | Dave Parks <davep@lindenlab.com> | 2011-07-25 21:09:58 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-07-25 21:09:58 -0500 |
commit | 51ccb58d31592c9530ad67b49d1aacd9644ff19e (patch) | |
tree | 09d65b1b4e8f2e1c6afcf9a4dc051d89e10e26fb | |
parent | 9395bcee52a9786185d90c52a22564b1d975e4ea (diff) | |
parent | b27e860c1e7d3c8ec1b3f7f540a22175b160cea1 (diff) |
merge
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index e473901609..5579473b8b 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -166,6 +166,7 @@ LLViewerShaderMgr::LLViewerShaderMgr() : mShaderList.push_back(&gWLCloudProgram); mShaderList.push_back(&gAvatarProgram); mShaderList.push_back(&gObjectShinyProgram); + mShaderList.push_back(&gObjectShinyNonIndexedProgram); mShaderList.push_back(&gWaterProgram); mShaderList.push_back(&gAvatarEyeballProgram); mShaderList.push_back(&gObjectSimpleProgram); @@ -190,6 +191,7 @@ LLViewerShaderMgr::LLViewerShaderMgr() : mShaderList.push_back(&gObjectFullbrightWaterProgram); mShaderList.push_back(&gAvatarWaterProgram); mShaderList.push_back(&gObjectShinyWaterProgram); + mShaderList.push_back(&gObjectShinyNonIndexedWaterProgram); mShaderList.push_back(&gUnderWaterProgram); mShaderList.push_back(&gDeferredSunProgram); mShaderList.push_back(&gDeferredBlurLightProgram); |