diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-08 15:31:26 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-08 15:31:26 -0500 |
| commit | d3aa36f1d478d51790e0fdf604e590baa04a93a4 (patch) | |
| tree | eaf568fd343797610263ec0764aafa1094098001 | |
| parent | cd7de2dfe7b837a7000e05606793cbbaec4d475e (diff) | |
| parent | 7d49f7af5843ae812617dd979fc61ad8ec0cd3c4 (diff) | |
merge
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 5dadd2c33b..f725f0fe86 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -996,8 +996,7 @@ void render_hud_attachments() S32 use_occlusion = LLPipeline::sUseOcclusion; LLPipeline::sUseOcclusion = 0; - LLPipeline::sDisableShaders = TRUE; - + //cull, sort, and render hud objects static LLCullResult result; LLSpatialGroup::sNoDelete = TRUE; @@ -1037,7 +1036,6 @@ void render_hud_attachments() gPipeline.toggleRenderDebugFeature((void*) LLPipeline::RENDER_DEBUG_FEATURE_UI); } LLPipeline::sUseOcclusion = use_occlusion; - LLPipeline::sDisableShaders = FALSE; } glMatrixMode(GL_PROJECTION); glPopMatrix(); |