svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release

Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp

Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)

1 files changed, 85 insertions, 85 deletions

diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h
index d3218ab81c..b827bb9925 100755
--- a/indra/llcrashlogger/llcrashlogger.h
+++ b/indra/llcrashlogger/llcrashlogger.h
@@ -1,85 +1,85 @@
-/** 

-* @file llcrashlogger.h

-* @brief Crash Logger Definition

-*

-* $LicenseInfo:firstyear=2003&license=viewergpl$

-* 

-* Copyright (c) 2003-2007, Linden Research, Inc.

-* 

-* Second Life Viewer Source Code

-* The source code in this file ("Source Code") is provided by Linden Lab

-* to you under the terms of the GNU General Public License, version 2.0

-* ("GPL"), unless you have obtained a separate licensing agreement

-* ("Other License"), formally executed by you and Linden Lab.  Terms of

-* the GPL can be found in doc/GPL-license.txt in this distribution, or

-* online at http://secondlife.com/developers/opensource/gplv2

-* 

-* There are special exceptions to the terms and conditions of the GPL as

-* it is applied to this Source Code. View the full text of the exception

-* in the file doc/FLOSS-exception.txt in this software distribution, or

-* online at http://secondlife.com/developers/opensource/flossexception

-* 

-* By copying, modifying or distributing this software, you acknowledge

-* that you have read and understood your obligations described above,

-* and agree to abide by those obligations.

-* 

-* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

-* COMPLETENESS OR PERFORMANCE.

-* $/LicenseInfo$

-*/

-#ifndef LLCRASHLOGGER_H

-#define LLCRASHLOGGER_H

-

-#include <vector>

-

-#include "linden_common.h"

-

-#include "llapp.h"

-#include "llsd.h"

-#include "llcontrol.h"

-

-class LLCrashLogger : public LLApp

-{

-public:

-	LLCrashLogger();

-	virtual ~LLCrashLogger();

-	S32 loadCrashBehaviorSetting();

-	void gatherFiles();

-	virtual void gatherPlatformSpecificFiles() {}

-	bool saveCrashBehaviorSetting(S32 crash_behavior);

-	bool sendCrashLogs();

-	LLSD constructPostData();

-	virtual void updateApplication(LLString message = "");

-	virtual bool init();

-	virtual bool mainLoop() = 0;

-	virtual bool cleanup() { return true; }

-	void setUserText(LLString& text) { mCrashInfo["UserNotes"] = text; }

-	S32 getCrashBehavior() { return mCrashBehavior; }

-protected:

-	S32 mCrashBehavior;

-	BOOL mCrashInPreviousExec;

-	std::map<LLString, LLString> mFileMap;

-	static const int mMaxSendSize = 200000;

-	LLString mGridName;

-	LLControlGroup mCrashSettings;

-	LLString mProductName;

-	LLSD mCrashInfo;

-	LLString mCrashHost;

-	LLString mAltCrashHost;

-	LLSD mDebugLog;

-	bool mSentCrashLogs;

-};

-

-class LLCrashLoggerText : public LLCrashLogger

-{

-public:

-	LLCrashLoggerText(void) {}

-	~LLCrashLoggerText(void) {}

-

-	virtual bool mainLoop();

-	virtual void updateApplication(LLString message = "");

-};

-

-

-#endif //LLCRASHLOGGER_H

+/** 
+* @file llcrashlogger.h
+* @brief Crash Logger Definition
+*
+* $LicenseInfo:firstyear=2003&license=viewergpl$
+* 
+* Copyright (c) 2003-2007, Linden Research, Inc.
+* 
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlife.com/developers/opensource/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlife.com/developers/opensource/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+#ifndef LLCRASHLOGGER_H
+#define LLCRASHLOGGER_H
+
+#include <vector>
+
+#include "linden_common.h"
+
+#include "llapp.h"
+#include "llsd.h"
+#include "llcontrol.h"
+
+class LLCrashLogger : public LLApp
+{
+public:
+	LLCrashLogger();
+	virtual ~LLCrashLogger();
+	S32 loadCrashBehaviorSetting();
+	void gatherFiles();
+	virtual void gatherPlatformSpecificFiles() {}
+	bool saveCrashBehaviorSetting(S32 crash_behavior);
+	bool sendCrashLogs();
+	LLSD constructPostData();
+	virtual void updateApplication(LLString message = "");
+	virtual bool init();
+	virtual bool mainLoop() = 0;
+	virtual bool cleanup() { return true; }
+	void setUserText(LLString& text) { mCrashInfo["UserNotes"] = text; }
+	S32 getCrashBehavior() { return mCrashBehavior; }
+protected:
+	S32 mCrashBehavior;
+	BOOL mCrashInPreviousExec;
+	std::map<LLString, LLString> mFileMap;
+	static const int mMaxSendSize = 200000;
+	LLString mGridName;
+	LLControlGroup mCrashSettings;
+	LLString mProductName;
+	LLSD mCrashInfo;
+	LLString mCrashHost;
+	LLString mAltCrashHost;
+	LLSD mDebugLog;
+	bool mSentCrashLogs;
+};
+
+class LLCrashLoggerText : public LLCrashLogger
+{
+public:
+	LLCrashLoggerText(void) {}
+	~LLCrashLoggerText(void) {}
+
+	virtual bool mainLoop();
+	virtual void updateApplication(LLString message = "");
+};
+
+
+#endif //LLCRASHLOGGER_H