diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-24 15:10:13 -0500 |
| commit | 0f86c26fa5c7c774e43189dd5ef5d68cb81e6dbf (patch) | |
| tree | 67f26cd98a492f0aff9d4ccb9a276221fdbc5e3a /indra/newview/llviewerwindow.cpp | |
| parent | 6df418b7af8b8088f72089dc11401db455c26e13 (diff) | |
| parent | 26a9a6929c23eabfef0a53355a392fef0ad26b83 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index c31e1c3ba9..988c4ed1a2 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2302,6 +2302,11 @@ void LLViewerWindow::draw() // Draw all nested UI views. // No translation needed, this view is glued to 0,0 + if (LLGLSLShader::sNoFixedFunction) + { + gUIProgram.bind(); + } + gGL.pushMatrix(); LLUI::pushMatrix(); { @@ -2376,6 +2381,11 @@ void LLViewerWindow::draw() LLUI::popMatrix(); gGL.popMatrix(); + if (LLGLSLShader::sNoFixedFunction) + { + gUIProgram.unbind(); + } + //#if LL_DEBUG LLView::sIsDrawing = FALSE; //#endif |