summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-03-08 10:56:55 -0800
committerEli Linden <eli@lindenlab.com>2010-03-08 10:56:55 -0800
commit5917029eefbd32d9db29e2359f9dcc805caeec60 (patch)
treeab995985e3dcf011d9938ab78838b3f1e669ffab /indra/newview/llviewerwindow.cpp
parent72c6dc9698d0815bfd5b9ebefb401d92c6337500 (diff)
parent0e11e774f839abf4c7e051fc3b021fd6d470a092 (diff)
Merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 6c8900df21..d0a1a31ebd 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2021,9 +2021,9 @@ void LLViewerWindow::drawDebugText()
void LLViewerWindow::draw()
{
-#if LL_DEBUG
+//#if LL_DEBUG
LLView::sIsDrawing = TRUE;
-#endif
+//#endif
stop_glerror();
LLUI::setLineWidth(1.f);
@@ -2135,9 +2135,9 @@ void LLViewerWindow::draw()
LLUI::popMatrix();
gGL.popMatrix();
-#if LL_DEBUG
+//#if LL_DEBUG
LLView::sIsDrawing = FALSE;
-#endif
+//#endif
}
// Takes a single keydown event, usually when UI is visible