Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

Conflicts:
	indra/newview/llvieweraudio.cpp

indra/newview/llviewermessage.cpp

@@ -43,7 +43,7 @@
 #include "llavatarnamecache.h"
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
-#include "mean_collision_data.h"
+
 #include "llfloaterbump.h"
 #include "llassetstorage.h"
 #include "llcachename.h"
@@ -61,7 +61,10 @@
 #include "llteleportflags.h"
 #include "lltracker.h"
 #include "lltransactionflags.h"
+#include "llvfile.h"
+#include "llvfs.h"
 #include "llxfermanager.h"
+#include "mean_collision_data.h"
 #include "message.h"
 #include "sound_ids.h"
 #include "lleventtimer.h"