diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-18 10:39:02 -0500 | 
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-18 10:39:02 -0500 | 
| commit | 190ff3c346ae8f86b4533fd03f7a0dcb0808dde3 (patch) | |
| tree | a0685253066ca296e110c9974bb19935eddbc01d /indra/newview | |
| parent | 6469f1c2f21ecd3b15a18957d882ef6a16b17ecf (diff) | |
SH-2031 Fix for link error in llui_libtest
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 4 | 
2 files changed, 0 insertions, 6 deletions
| diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 812b03a2e6..a772777495 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -63,11 +63,9 @@ LLVector4			gShinyOrigin;  //utility shaders  LLGLSLShader	gOcclusionProgram; -LLGLSLShader	gUIProgram;  LLGLSLShader	gCustomAlphaProgram;  LLGLSLShader	gGlowCombineProgram;  LLGLSLShader	gTwoTextureAddProgram; -LLGLSLShader	gSolidColorProgram;  //object shaders  LLGLSLShader		gObjectSimpleProgram; diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index 6b22e83a9f..93a0ecc4f0 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -289,16 +289,12 @@ extern LLVector4			gShinyOrigin;  //utility shaders  extern LLGLSLShader			gOcclusionProgram; -extern LLGLSLShader			gUIProgram;  extern LLGLSLShader			gCustomAlphaProgram;  extern LLGLSLShader			gGlowCombineProgram;  //output tex0[tc0] + tex1[tc1]  extern LLGLSLShader			gTwoTextureAddProgram; -//output vec4(color.rgb,color.a*tex0[tc0].a) -extern LLGLSLShader			gSolidColorProgram; -  //object shaders  extern LLGLSLShader			gObjectSimpleProgram;  extern LLGLSLShader			gObjectSimpleWaterProgram; | 
