From 5161b500c97878179cc4f8c9a0df717a25c5cb14 Mon Sep 17 00:00:00 2001 From: Kyle Ambroff Date: Thu, 27 Jan 2011 15:14:18 -0800 Subject: Prevent crashiness from DisableRendering setting. When DisableRendering is set, bypass all of the new rendering code that would have crashed otherwise, since the GL manager isn't initialized. Many of these blocks will be removed once I get LLWindowHeadless working with the viewer. --HG-- branch : headless --- indra/newview/llviewerwindow.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llviewerwindow.cpp') diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 166b110412..7b41ac9287 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2573,15 +2573,15 @@ void LLViewerWindow::updateUI() LLView::sMouseHandlerMessage.clear(); - S32 x = mCurrentMousePoint.mX; - S32 y = mCurrentMousePoint.mY; - MASK mask = gKeyboard->currentMask(TRUE); - if (gNoRender) { return; } + S32 x = mCurrentMousePoint.mX; + S32 y = mCurrentMousePoint.mY; + MASK mask = gKeyboard->currentMask(TRUE); + if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST)) { gDebugRaycastFaceHit = -1; -- cgit v1.2.3