From 229ad9f27b13b8348adcaec60eff1ebedca7d503 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 27 Jun 2014 12:10:38 +0200 Subject: [PATCH] Fix the screen flashing during startup with login progress screen disabled in the place it used to happen before --- indra/newview/llviewerdisplay.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 78c39eaa23..a88f2c1d15 100755 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -133,11 +133,6 @@ void display_startup() { return; } - - // Once at and past STATE_PRECACHE display() kicks in and starts to draw, we can safely eit here. - if (LLStartUp::getStartupState() >= STATE_PRECACHE) - return; - // gPipeline.updateGL(); @@ -377,7 +372,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) // Bail out if we're in the startup state and don't want to try to // render the world. // - if (LLStartUp::getStartupState() < STATE_PRECACHE) + // Revert to original state to prevent flickering if login progress screen is disabled + //if (LLStartUp::getStartupState() < STATE_PRECACHE) + if (LLStartUp::getStartupState() < STATE_STARTED) + // { LLAppViewer::instance()->pingMainloopTimeout("Display:Startup"); display_startup();