OpenSim crash fixes, thx to Henri and Zauber

2011-03-15 15:19:37 +01:00
parent 0eab7bd2a5
commit 7b98e5f2f1
10 changed files with 58 additions and 10 deletions
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -267,8 +267,16 @@ void LLFontGL::destroyAllGL()
 {
 	if (sFontRegistry)
 	{
+		if (LLFont::sOpenGLcrashOnRestart)
+		{
+			// This will leak memory but will prevent a crash...
+			sFontRegistry = NULL;
+		}
+		else
+		{
 		sFontRegistry->destroyGL();
 	}
+	}
 }

 void LLFontGL::destroyGL()