Backed out changeset 9d2814c28154 to check if logout crashes are fixed with b0b94907a8a6

Fri, 18 May 2018 09:15:57 +0200

author
Ansariel
date
Fri, 18 May 2018 09:15:57 +0200
changeset 55380
2a57bc8fe712
parent 55379
a780668b9a62
child 55381
e889137a6111

Backed out changeset 9d2814c28154 to check if logout crashes are fixed with b0b94907a8a6

indra/newview/llmeshrepository.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llmeshrepository.cpp	Fri May 18 08:44:51 2018 +0200
     1.2 +++ b/indra/newview/llmeshrepository.cpp	Fri May 18 09:15:57 2018 +0200
     1.3 @@ -3504,12 +3504,8 @@
     1.4  
     1.5  	if (mDecompThread)
     1.6  	{
     1.7 -		mDecompThread->shutdown();
     1.8 -
     1.9 -		// <FS:ND> Deleting the thread at this point can lead to very subtle memory corruption due to the thread still possibly executing code that comes after shutdown does return.
    1.10 -		// Not nice, but leak it and let the OS clean up once process exit is complete.
    1.11 -		// delete mDecompThread;
    1.12 -		
    1.13 +		mDecompThread->shutdown();		
    1.14 +		delete mDecompThread;
    1.15  		mDecompThread = NULL;
    1.16  	}
    1.17  

mercurial