diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-07-25 18:26:14 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-07-25 18:26:14 -0400 |
| commit | c07f55e605253f2cafbdfba1f7bd267d855d3a5f (patch) | |
| tree | f1720b985981f249484f41bfa75f534867f79db9 /indra/newview/llviewerwindow.cpp | |
| parent | ca5bd96bb0d60c795b78c883e91792d4a68ad2c1 (diff) | |
| parent | 825fc273ee5167052d811dc058b1834c86e005da (diff) | |
merging latest viewer-development to mesh merge candidate.
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 0e158693b9..d7509b4e41 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2287,6 +2287,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(); { @@ -2361,6 +2366,11 @@ void LLViewerWindow::draw() LLUI::popMatrix(); gGL.popMatrix(); + if (LLGLSLShader::sNoFixedFunction) + { + gUIProgram.unbind(); + } + //#if LL_DEBUG LLView::sIsDrawing = FALSE; //#endif |