Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

3 files changed, 49 insertions, 49 deletions

diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp
index 63e5409876..b36312c607 100644
--- a/indra/linux_crash_logger/linux_crash_logger.cpp
+++ b/indra/linux_crash_logger/linux_crash_logger.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file linux_crash_logger.cpp
  * @brief Linux crash logger implementation
  *
  * $LicenseInfo:firstyear=2003&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -30,29 +30,29 @@
 
 int main(int argc, char **argv)
 {
-	LL_INFOS() << "Starting crash reporter." << LL_ENDL;
+    LL_INFOS() << "Starting crash reporter." << LL_ENDL;
 
-	LLCrashLoggerLinux app;
-	app.parseCommandOptions(argc, argv);
+    LLCrashLoggerLinux app;
+    app.parseCommandOptions(argc, argv);
 
     LLSD options = LLApp::instance()->getOptionData(
                         LLApp::PRIORITY_COMMAND_LINE);
                         //LLApp::PRIORITY_RUNTIME_OVERRIDE);
 
-    
+
     if (!(options.has("pid") && options.has("dumpdir")))
     {
         LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL;
     }
 
-	if (! app.init())
-	{
-		LL_WARNS() << "Unable to initialize application." << LL_ENDL;
-		return 1;
-	}
+    if (! app.init())
+    {
+        LL_WARNS() << "Unable to initialize application." << LL_ENDL;
+        return 1;
+    }
 
-	app.frame();
-	app.cleanup();
-	LL_INFOS() << "Crash reporter finished normally." << LL_ENDL;
-	return 0;
+    app.frame();
+    app.cleanup();
+    LL_INFOS() << "Crash reporter finished normally." << LL_ENDL;
+    return 0;
 }
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 22182d32a4..7992f59b36 100644
--- a/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -30,7 +30,7 @@
 
 #include "linden_common.h"
 
-#include "indra_constants.h"	// CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
+#include "indra_constants.h"    // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
 #include "llerror.h"
 #include "llfile.h"
 #include "lltimer.h"
@@ -53,7 +53,7 @@ static const char dialog_title[] =
 
 static BOOL do_ask_dialog(void)
 {
-	// Ask to send crash report. Yes/No dialog.
+    // Ask to send crash report. Yes/No dialog.
 }
 
 LLCrashLoggerLinux::LLCrashLoggerLinux(void)
@@ -70,31 +70,31 @@ void LLCrashLoggerLinux::gatherPlatformSpecificFiles()
 
 bool LLCrashLoggerLinux::frame()
 {
-	bool send_logs = true;
-	if(CRASH_BEHAVIOR_ASK == getCrashBehavior())
-	{
-		send_logs = do_ask_dialog();
-	}
-	else if(CRASH_BEHAVIOR_NEVER_SEND == getCrashBehavior())
-	{
-		send_logs = false;
-	}
-
-	if(send_logs)
-	{
-		sendCrashLogs();
-	}
-	return true;
+    bool send_logs = true;
+    if(CRASH_BEHAVIOR_ASK == getCrashBehavior())
+    {
+        send_logs = do_ask_dialog();
+    }
+    else if(CRASH_BEHAVIOR_NEVER_SEND == getCrashBehavior())
+    {
+        send_logs = false;
+    }
+
+    if(send_logs)
+    {
+        sendCrashLogs();
+    }
+    return true;
 }
 
 bool LLCrashLoggerLinux::cleanup()
 {
-	commonCleanup();
+    commonCleanup();
     mKeyMaster.releaseMaster();
-	return true;
+    return true;
 }
 
 void LLCrashLoggerLinux::updateApplication(const std::string& message)
 {
-	LLCrashLogger::updateApplication(message);
+    LLCrashLogger::updateApplication(message);
 }
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h
index 789f6f03f5..dcecbe746d 100644
--- a/indra/linux_crash_logger/llcrashloggerlinux.h
+++ b/indra/linux_crash_logger/llcrashloggerlinux.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcrashloggerlinux.h
  * @brief Linux crash logger definition
  *
  * $LicenseInfo:firstyear=2003&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -34,12 +34,12 @@
 class LLCrashLoggerLinux : public LLCrashLogger
 {
 public:
-	LLCrashLoggerLinux(void);
-	~LLCrashLoggerLinux(void);
-	virtual bool frame();
-	virtual void updateApplication(const std::string& = LLStringUtil::null);
-	virtual void gatherPlatformSpecificFiles();
-	virtual bool cleanup();
+    LLCrashLoggerLinux(void);
+    ~LLCrashLoggerLinux(void);
+    virtual bool frame();
+    virtual void updateApplication(const std::string& = LLStringUtil::null);
+    virtual void gatherPlatformSpecificFiles();
+    virtual bool cleanup();
 };
 
 #endif