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

Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp

indra/newview/llvowlsky.cpp

@@ -354,6 +354,7 @@ BOOL LLVOWLSky::updateGeometry(LLDrawable * drawable)
 		llinfos << "WL Skydome strips in " << strips_segments << " batches." << llendl;
 
 		mStripsVerts.resize(strips_segments, NULL);
+
 		LLTimer timer;
 		timer.start();