merge with release

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/win_crash_logger/win_crash_logger.cpp b/indra/win_crash_logger/win_crash_logger.cpp
index 79b8514725..366edd894b 100755
--- a/indra/win_crash_logger/win_crash_logger.cpp
+++ b/indra/win_crash_logger/win_crash_logger.cpp
@@ -34,7 +34,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                      LPSTR     lpCmdLine,
                      int       nCmdShow)
 {
-	llinfos << "Starting crash reporter with args" << &lpCmdLine << llendl;
+	LL_INFOS() << "Starting crash reporter with args" << &lpCmdLine << LL_ENDL;
 	LLCrashLoggerWindows app;
 	app.setHandle(hInstance);
 	app.parseCommandOptions(__argc, __argv);
@@ -43,17 +43,17 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                    LLApp::PRIORITY_COMMAND_LINE);
     if (!(options.has("pid") && options.has("dumpdir")))
     {
-        llwarns << "Insufficient parameters to crash report." << llendl; 
+        LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL; 
     }
 	if (! app.init())
 	{
-		llwarns << "Unable to initialize application." << llendl;
-		return 1;
+		LL_WARNS() << "Unable to initialize application." << LL_ENDL;
+		return -1;
 	}
 
 	app.processingLoop();
 	app.mainLoop();
 	app.cleanup();
-	llinfos << "Crash reporter finished normally." << llendl;
+	LL_INFOS() << "Crash reporter finished normally." << LL_ENDL;
 	return 0;
 }