Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2015-08-12 14:52:52 -04:00
parent e797a5eb0e 25fbeb2080
commit dfa40d8939
201 changed files with 10553 additions and 6878 deletions
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1641,6 +1641,8 @@ bool LLAppViewer::cleanup()

 	LLAvatarAppearance::cleanupClass();
 	
+	LLAvatarAppearance::cleanupClass();
+	
 	LLPostProcess::cleanupClass();

 	LLTracker::cleanupInstance();
@@ -1878,6 +1880,8 @@ bool LLAppViewer::cleanup()

 	ll_close_fail_log();

+	LLError::LLCallStacks::cleanup();
+
 	MEM_TRACK_RELEASE

    LL_INFOS() << "Goodbye!" << LL_ENDL;