diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-25 09:49:58 -0400 |
| commit | b8be8820ea52a77df6362179b1dda3fc4a305913 (patch) | |
| tree | 061d59de4c1ccca88aa82ec7381790581f90bee9 /indra/newview/llviewerwindow.cpp | |
| parent | e0728065251fbd5f45218eb94c056a92162eb54d (diff) | |
| parent | a5769e81263d6d004033b914c1cbf1a8296923d9 (diff) | |
close head created by 54e071a92450
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 |