diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-24 09:29:12 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-24 09:29:12 +0200 |
| commit | fd28ebafddf8e0bdbb2d202077358a86b7539b6a (patch) | |
| tree | 0d1eed0a59170328160d7a7ab0fd716c2f681c0b /indra/newview/llstartup.cpp | |
| parent | f9242c3caa1e4bac5dbb89adc1ebc50f848859cb (diff) | |
| parent | 976dab16a307d16c277a50c6f9582781731a352d (diff) | |
Merged in lindenlab/viewer-lynx
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; |