Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp
index d4e7ad7be3..36f62451d7 100755
--- a/indra/linux_crash_logger/linux_crash_logger.cpp
+++ b/indra/linux_crash_logger/linux_crash_logger.cpp
@@ -30,7 +30,7 @@
 
 int main(int argc, char **argv)
 {
-	llinfos << "Starting crash reporter." << llendl;
+	LL_INFOS() << "Starting crash reporter." << LL_ENDL;
 
 	LLCrashLoggerLinux app;
 	app.parseCommandOptions(argc, argv);
@@ -47,12 +47,12 @@ int main(int argc, char **argv)
 
 	if (! app.init())
 	{
-		llwarns << "Unable to initialize application." << llendl;
+		LL_WARNS() << "Unable to initialize application." << LL_ENDL;
 		return 1;
 	}
 
 	app.mainLoop();
 	app.cleanup();
-	llinfos << "Crash reporter finished normally." << llendl;
+	LL_INFOS() << "Crash reporter finished normally." << LL_ENDL;
 	return 0;
 }