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

SL-11309 Crash on attempt to costruct singletone

meow-7.2.2
andreykproductengine 2019-05-29 19:28:52 +03:00
parent ff2a6f97a2
commit d081df14ef
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llstartup.cpp
View File

@ -162,6 +162,7 @@
#include "llviewerparcelmgr.h" #include "llviewerparcelmgr.h"
#include "llviewerregion.h" #include "llviewerregion.h"
#include "llviewerstats.h" #include "llviewerstats.h"
#include "llviewerstatsrecorder.h"
#include "llviewerthrottle.h" #include "llviewerthrottle.h"
#include "llviewerwindow.h" #include "llviewerwindow.h"
#include "llvoavatar.h" #include "llvoavatar.h"
@ -1228,6 +1229,7 @@ bool idle_startup()
// //
// Initialize classes w/graphics stuff. // Initialize classes w/graphics stuff.
// //
LLViewerStatsRecorder::instance(); // Since textures work in threads
gTextureList.doPrefetchImages(); gTextureList.doPrefetchImages();
display_startup(); display_startup();

6
indra/newview/lltexturefetch.cpp
View File

@ -2409,7 +2409,11 @@ S32 LLTextureFetchWorker::callbackHttpGet(LLCore::HttpResponse * response,
mLoaded = TRUE; mLoaded = TRUE;
setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority); setPriority(LLWorkerThread::PRIORITY_HIGH | mWorkPriority);
LLViewerStatsRecorder::instance().log(0.2f); if (LLViewerStatsRecorder::instanceExists())
{
// Do not create this instance inside thread
LLViewerStatsRecorder::instance().log(0.2f);
}
return data_size ; return data_size ;
} }