From ef8bdb5d95ebd869279ee4bb0510d54e51ab747f Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 8 Nov 2011 15:15:58 -0600
Subject: SH-2507 Fix for crash when rendering axes (develop->render->show
axes)
---
indra/newview/llviewerdisplay.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 86102e9a15..3f0b5bf3fb 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1341,12 +1341,6 @@ void render_ui_3d()
// Debugging stuff goes before the UI.
- // Coordinate axes
- if (gSavedSettings.getBOOL("ShowAxes"))
- {
- draw_axes();
- }
-
stop_glerror();
if (LLGLSLShader::sNoFixedFunction)
@@ -1354,6 +1348,12 @@ void render_ui_3d()
gUIProgram.bind();
}
+ // Coordinate axes
+ if (gSavedSettings.getBOOL("ShowAxes"))
+ {
+ draw_axes();
+ }
+
gViewerWindow->renderSelections(FALSE, FALSE, TRUE); // Non HUD call in render_hud_elements
stop_glerror();
}
--
cgit v1.2.3