diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:15:58 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:15:58 -0600 |
| commit | ef8bdb5d95ebd869279ee4bb0510d54e51ab747f (patch) | |
| tree | c25f575a9c509f0c295e91c29870b79c13b9706e /indra/newview/llviewerdisplay.cpp | |
| parent | da092a06cf42902de4f5a042fd0b314b34e4392d (diff) | |
SH-2507 Fix for crash when rendering axes (develop->render->show axes)
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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(); } |