From 87b6a05ba628f5d4351263e449d6fef72d51e993 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 16 Mar 2018 19:17:44 +0200 Subject: MAINT-8372 Fixed doubled error messages --- indra/newview/llstartup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 7ea6a14e6b..2e3f6a3199 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1154,7 +1154,7 @@ bool idle_startup() } } - else + else if (!message.empty()) { // This wasn't a certificate error, so throw up the normal // notificatioin message. -- cgit v1.2.3 From 976dab16a307d16c277a50c6f9582781731a352d Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Fri, 23 Mar 2018 19:14:41 +0200 Subject: MAINT-8417 Don't run display or startup if window is not initialized --- indra/newview/llstartup.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 2e3f6a3199..2ed2f8644e 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -313,6 +313,13 @@ void set_flags_and_update_appearance() // true when all initialization done. bool idle_startup() { + if (gViewerWindow == NULL) + { + // We expect window to be initialized + LL_WARNS_ONCE() << "gViewerWindow is not initialized" << LL_ENDL; + return false; // No world yet + } + const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay"); static LLTimer timeout; -- cgit v1.2.3