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

indra/newview/llappviewer.cpp

@@ -593,6 +593,9 @@ bool LLAppViewer::init()
 	// we run the "program crashed last time" error handler below.
 	//
 	
+	// We can call this early.
+	LLFrameTimer::global_initialization();
+
 	// initialize SSE options
 	LLVector4a::initClass();
 	// Need to do this initialization before we do anything else, since anything

indra/newview/pipeline.cpp

@@ -2552,7 +2552,7 @@ void LLPipeline::processPartitionQ()
 void LLPipeline::markRebuild(LLSpatialGroup* group, BOOL priority)
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE);
-	//assert_main_thread();
+	//llassert(is_main_thread());
 
 	if (group && !group->isDead() && group->mSpatialPartition)
 	{