livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in lindenlab/viewer-lynx

master
AndreyL ProductEngine 2018-03-24 09:29:12 +02:00
parent f9242c3caa 976dab16a3
commit fd28ebafdd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llappviewer.cpp
View File

@ -959,10 +959,11 @@ bool LLAppViewer::init()
if (!initCache())
{
LL_WARNS("InitInfo") << "Failed to init cache" << LL_ENDL;
std::ostringstream msg;
msg << LLTrans::getString("MBUnableToAccessFile");
OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
return 1;
return 0;
}
LL_INFOS("InitInfo") << "Cache initialization is done." << LL_ENDL ;
@ -1431,7 +1432,7 @@ bool LLAppViewer::doFrame()
// Render scene.
// *TODO: Should we run display() even during gHeadlessClient? DK 2011-02-18
if (!LLApp::isExiting() && !gHeadlessClient)
if (!LLApp::isExiting() && !gHeadlessClient && gViewerWindow)
{
pingMainloopTimeout("Main:Display");
gGLActive = TRUE;

7
indra/newview/llstartup.cpp
View File

@ -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;