diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-05 19:09:28 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-05 19:09:28 -0400 |
| commit | 8c5da0552db39ba6031b76ffb08994e53217a559 (patch) | |
| tree | f4ac194d15a0a58475496543bbb36d587d195b4f /indra/newview/llviewerwindow.cpp | |
| parent | fce8bda3b6e502b3de9b6a34279255999478e407 (diff) | |
| parent | 8675901fa85de600cc1ef7c5263a5906fd2b2811 (diff) | |
merged .hgtags
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 |