Merge tag '7.1.7-release'

source for viewer 7.1.7.8974243247

1 files changed, 32 insertions, 32 deletions

diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h
index e3e8110a47..a5839b4622 100644
--- a/indra/llcrashlogger/llcrashlogger.h
+++ b/indra/llcrashlogger/llcrashlogger.h
@@ -1,25 +1,25 @@
-/** 
+/**
 * @file llcrashlogger.h
 * @brief 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$
 */
@@ -49,26 +49,26 @@ const S32 CRASH_BEHAVIOR_NEVER_SEND = 2;
 class LLCrashLogger : public LLApp
 {
 public:
-	LLCrashLogger();
-	virtual ~LLCrashLogger();
-	std::string loadCrashURLSetting();
+    LLCrashLogger();
+    virtual ~LLCrashLogger();
+    std::string loadCrashURLSetting();
     bool readFromXML(LLSD& dest, const std::string& filename );
-	void gatherFiles();
+    void gatherFiles();
     void mergeLogs( LLSD src_sd );
 
-	virtual void gatherPlatformSpecificFiles() {}
+    virtual void gatherPlatformSpecificFiles() {}
     bool sendCrashLog(std::string dump_dir);
-	bool sendCrashLogs();
-	LLSD constructPostData();
-	virtual void updateApplication(const std::string& message = LLStringUtil::null);
-	virtual bool init();
-	virtual bool frame() = 0;
-	virtual bool cleanup() = 0;
-	void commonCleanup();
-	void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; }
-	S32 getCrashBehavior() { return mCrashBehavior; }
-	bool runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout);
-	bool readMinidump(std::string minidump_path);
+    bool sendCrashLogs();
+    LLSD constructPostData();
+    virtual void updateApplication(const std::string& message = LLStringUtil::null);
+    virtual bool init();
+    virtual bool frame() = 0;
+    virtual bool cleanup() = 0;
+    void commonCleanup();
+    void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; }
+    S32 getCrashBehavior() { return mCrashBehavior; }
+    bool runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout);
+    bool readMinidump(std::string minidump_path);
 
 protected:
     static void init_curl();
@@ -76,17 +76,17 @@ protected:
     static void ssl_thread_id_callback(CRYPTO_THREADID*);
     static void ssl_locking_callback(int mode, int type, const char * file, int line);
 
-	S32 mCrashBehavior;
-	BOOL mCrashInPreviousExec;
-	std::map<std::string, std::string> mFileMap;
-	std::string mGridName;
-	LLControlGroup mCrashSettings;
-	std::string mProductName;
-	LLSD mCrashInfo;
-	std::string mCrashHost;
-	std::string mAltCrashHost;
-	LLSD mDebugLog;
-	bool mSentCrashLogs;
+    S32 mCrashBehavior;
+    BOOL mCrashInPreviousExec;
+    std::map<std::string, std::string> mFileMap;
+    std::string mGridName;
+    LLControlGroup mCrashSettings;
+    std::string mProductName;
+    LLSD mCrashInfo;
+    std::string mCrashHost;
+    std::string mAltCrashHost;
+    LLSD mDebugLog;
+    bool mSentCrashLogs;
     LLCrashLock mKeyMaster;
 
     static int ssl_mutex_count;