diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-03-23 19:14:41 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-03-23 19:14:41 +0200 |
| commit | 976dab16a307d16c277a50c6f9582781731a352d (patch) | |
| tree | 1615aca865b2cd275da2ccd77e09574dcb9a9d33 /indra/newview/llstartup.cpp | |
| parent | 00c6c29daf1250f4be217077fd3156e799f65e91 (diff) | |
MAINT-8417 Don't run display or startup if window is not initialized
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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; |