#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed

1 files changed, 453 insertions, 453 deletions

diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 41101e79a6..4c90a82fcb 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -5,24 +5,24 @@
  * $LicenseInfo:firstyear=2007&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$
- */ 
+ */
 
 #include "llviewerprecompiledheaders.h"
 
@@ -38,11 +38,11 @@
 #include "llgl.h"
 #include "res/resource.h" // *FIX: for setting gIconResource.
 
-#include <fcntl.h>		//_O_APPEND
-#include <io.h>			//_open_osfhandle()
-#include <WERAPI.H>		// for WerAddExcludedApplication()
-#include <process.h>	// _spawnl()
-#include <tchar.h>		// For TCHAR support
+#include <fcntl.h>      //_O_APPEND
+#include <io.h>         //_open_osfhandle()
+#include <WERAPI.H>     // for WerAddExcludedApplication()
+#include <process.h>    // _spawnl()
+#include <tchar.h>      // For TCHAR support
 
 #include "llviewercontrol.h"
 #include "lldxhardware.h"
@@ -177,28 +177,28 @@ namespace
 
 static void exceptionTerminateHandler()
 {
-	// reinstall default terminate() handler in case we re-terminate.
-	if (gOldTerminateHandler) std::set_terminate(gOldTerminateHandler);
-	// treat this like a regular viewer crash, with nice stacktrace etc.
+    // reinstall default terminate() handler in case we re-terminate.
+    if (gOldTerminateHandler) std::set_terminate(gOldTerminateHandler);
+    // treat this like a regular viewer crash, with nice stacktrace etc.
     long *null_ptr;
     null_ptr = 0;
     *null_ptr = 0xDEADBEEF; //Force an exception that will trigger breakpad.
 
-	// we've probably been killed-off before now, but...
-	gOldTerminateHandler(); // call old terminate() handler
+    // we've probably been killed-off before now, but...
+    gOldTerminateHandler(); // call old terminate() handler
 }
 
 LONG WINAPI catchallCrashHandler(EXCEPTION_POINTERS * /*ExceptionInfo*/)
 {
-	LL_WARNS() << "Hit last ditch-effort attempt to catch crash." << LL_ENDL;
-	exceptionTerminateHandler();
-	return 0;
+    LL_WARNS() << "Hit last ditch-effort attempt to catch crash." << LL_ENDL;
+    exceptionTerminateHandler();
+    return 0;
 }
 
 // *FIX:Mani - This hack is to fix a linker issue with libndofdev.lib
 // The lib was compiled under VS2005 - in VS2003 we need to remap assert
 #ifdef LL_DEBUG
-#ifdef LL_MSVC7 
+#ifdef LL_MSVC7
 extern "C" {
     void _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line)
     {
@@ -211,200 +211,200 @@ extern "C" {
 const std::string LLAppViewerWin32::sWindowClass = "Second Life";
 
 /*
-    This function is used to print to the command line a text message 
+    This function is used to print to the command line a text message
     describing the nvapi error and quits
 */
 void nvapi_error(NvAPI_Status status)
 {
     NvAPI_ShortString szDesc = {0};
-	NvAPI_GetErrorMessage(status, szDesc);
-	LL_WARNS() << szDesc << LL_ENDL;
+    NvAPI_GetErrorMessage(status, szDesc);
+    LL_WARNS() << szDesc << LL_ENDL;
 
-	//should always trigger when asserts are enabled
-	//llassert(status == NVAPI_OK);
+    //should always trigger when asserts are enabled
+    //llassert(status == NVAPI_OK);
 }
 
-// Create app mutex creates a unique global windows object. 
+// Create app mutex creates a unique global windows object.
 // If the object can be created it returns true, otherwise
-// it returns false. The false result can be used to determine 
+// it returns false. The false result can be used to determine
 // if another instance of a second life app (this vers. or later)
 // is running.
 // *NOTE: Do not use this method to run a single instance of the app.
-// This is intended to help debug problems with the cross-platform 
+// This is intended to help debug problems with the cross-platform
 // locked file method used for that purpose.
 bool create_app_mutex()
 {
-	bool result = true;
-	LPCWSTR unique_mutex_name = L"SecondLifeAppMutex";
-	HANDLE hMutex;
-	hMutex = CreateMutex(NULL, TRUE, unique_mutex_name); 
-	if(GetLastError() == ERROR_ALREADY_EXISTS) 
-	{     
-		result = false;
-	}
-	return result;
+    bool result = true;
+    LPCWSTR unique_mutex_name = L"SecondLifeAppMutex";
+    HANDLE hMutex;
+    hMutex = CreateMutex(NULL, TRUE, unique_mutex_name);
+    if(GetLastError() == ERROR_ALREADY_EXISTS)
+    {
+        result = false;
+    }
+    return result;
 }
 
 void ll_nvapi_init(NvDRSSessionHandle hSession)
 {
-	// (2) load all the system settings into the session
-	NvAPI_Status status = NvAPI_DRS_LoadSettings(hSession);
-	if (status != NVAPI_OK) 
-	{
-		nvapi_error(status);
-		return;
-	}
-
-	NvAPI_UnicodeString profile_name;
-	std::string app_name = LLTrans::getString("APP_NAME");
-	llutf16string w_app_name = utf8str_to_utf16str(app_name);
-	wsprintf(profile_name, L"%s", w_app_name.c_str());
-	NvDRSProfileHandle hProfile = 0;
-	// (3) Check if we already have an application profile for the viewer
-	status = NvAPI_DRS_FindProfileByName(hSession, profile_name, &hProfile);
-	if (status != NVAPI_OK && status != NVAPI_PROFILE_NOT_FOUND)
-	{
-		nvapi_error(status);
-		return;
-	}
-	else if (status == NVAPI_PROFILE_NOT_FOUND)
-	{
-		// Don't have an application profile yet - create one
-		LL_INFOS() << "Creating NVIDIA application profile" << LL_ENDL;
-
-		NVDRS_PROFILE profileInfo;
-		profileInfo.version = NVDRS_PROFILE_VER;
-		profileInfo.isPredefined = 0;
-		wsprintf(profileInfo.profileName, L"%s", w_app_name.c_str());
-
-		status = NvAPI_DRS_CreateProfile(hSession, &profileInfo, &hProfile);
-		if (status != NVAPI_OK)
-		{
-			nvapi_error(status);
-			return;
-		}
-	}
-
-	// (4) Check if current exe is part of the profile
-	std::string exe_name = gDirUtilp->getExecutableFilename();
-	NVDRS_APPLICATION profile_application;
-	profile_application.version = NVDRS_APPLICATION_VER;
-
-	llutf16string w_exe_name = utf8str_to_utf16str(exe_name);
-	NvAPI_UnicodeString profile_app_name;
-	wsprintf(profile_app_name, L"%s", w_exe_name.c_str());
-
-	status = NvAPI_DRS_GetApplicationInfo(hSession, hProfile, profile_app_name, &profile_application);
-	if (status != NVAPI_OK && status != NVAPI_EXECUTABLE_NOT_FOUND)
-	{
-		nvapi_error(status);
-		return;
-	}
-	else if (status == NVAPI_EXECUTABLE_NOT_FOUND)
-	{
-		LL_INFOS() << "Creating application for " << exe_name << " for NVIDIA application profile" << LL_ENDL;
-
-		// Add this exe to the profile
-		NVDRS_APPLICATION application;
-		application.version = NVDRS_APPLICATION_VER;
-		application.isPredefined = 0;
-		wsprintf(application.appName, L"%s", w_exe_name.c_str());
-		wsprintf(application.userFriendlyName, L"%s", w_exe_name.c_str());
-		wsprintf(application.launcher, L"%s", w_exe_name.c_str());
-		wsprintf(application.fileInFolder, L"%s", "");
-
-		status = NvAPI_DRS_CreateApplication(hSession, hProfile, &application);
-		if (status != NVAPI_OK)
-		{
-			nvapi_error(status);
-			return;
-		}
-
-		// Save application in case we added one
-		status = NvAPI_DRS_SaveSettings(hSession);
-		if (status != NVAPI_OK)
-		{
-			nvapi_error(status);
-			return;
-		}
-	}
-
-	// load settings for querying 
-	status = NvAPI_DRS_LoadSettings(hSession);
-	if (status != NVAPI_OK)
-	{
-		nvapi_error(status);
-		return;
-	}
-
-	//get the preferred power management mode for Second Life
-	NVDRS_SETTING drsSetting = {0};
-	drsSetting.version = NVDRS_SETTING_VER;
-	status = NvAPI_DRS_GetSetting(hSession, hProfile, PREFERRED_PSTATE_ID, &drsSetting);
-	if (status == NVAPI_SETTING_NOT_FOUND)
-	{ //only override if the user hasn't specifically set this setting
-		// (5) Specify that we want to enable maximum performance setting
-		// first we fill the NVDRS_SETTING struct, then we call the function
-		drsSetting.version = NVDRS_SETTING_VER;
-		drsSetting.settingId = PREFERRED_PSTATE_ID;
-		drsSetting.settingType = NVDRS_DWORD_TYPE;
-		drsSetting.u32CurrentValue = PREFERRED_PSTATE_PREFER_MAX;
-		status = NvAPI_DRS_SetSetting(hSession, hProfile, &drsSetting);
-		if (status != NVAPI_OK) 
-		{
-			nvapi_error(status);
-			return;
-		}
+    // (2) load all the system settings into the session
+    NvAPI_Status status = NvAPI_DRS_LoadSettings(hSession);
+    if (status != NVAPI_OK)
+    {
+        nvapi_error(status);
+        return;
+    }
+
+    NvAPI_UnicodeString profile_name;
+    std::string app_name = LLTrans::getString("APP_NAME");
+    llutf16string w_app_name = utf8str_to_utf16str(app_name);
+    wsprintf(profile_name, L"%s", w_app_name.c_str());
+    NvDRSProfileHandle hProfile = 0;
+    // (3) Check if we already have an application profile for the viewer
+    status = NvAPI_DRS_FindProfileByName(hSession, profile_name, &hProfile);
+    if (status != NVAPI_OK && status != NVAPI_PROFILE_NOT_FOUND)
+    {
+        nvapi_error(status);
+        return;
+    }
+    else if (status == NVAPI_PROFILE_NOT_FOUND)
+    {
+        // Don't have an application profile yet - create one
+        LL_INFOS() << "Creating NVIDIA application profile" << LL_ENDL;
+
+        NVDRS_PROFILE profileInfo;
+        profileInfo.version = NVDRS_PROFILE_VER;
+        profileInfo.isPredefined = 0;
+        wsprintf(profileInfo.profileName, L"%s", w_app_name.c_str());
+
+        status = NvAPI_DRS_CreateProfile(hSession, &profileInfo, &hProfile);
+        if (status != NVAPI_OK)
+        {
+            nvapi_error(status);
+            return;
+        }
+    }
+
+    // (4) Check if current exe is part of the profile
+    std::string exe_name = gDirUtilp->getExecutableFilename();
+    NVDRS_APPLICATION profile_application;
+    profile_application.version = NVDRS_APPLICATION_VER;
+
+    llutf16string w_exe_name = utf8str_to_utf16str(exe_name);
+    NvAPI_UnicodeString profile_app_name;
+    wsprintf(profile_app_name, L"%s", w_exe_name.c_str());
+
+    status = NvAPI_DRS_GetApplicationInfo(hSession, hProfile, profile_app_name, &profile_application);
+    if (status != NVAPI_OK && status != NVAPI_EXECUTABLE_NOT_FOUND)
+    {
+        nvapi_error(status);
+        return;
+    }
+    else if (status == NVAPI_EXECUTABLE_NOT_FOUND)
+    {
+        LL_INFOS() << "Creating application for " << exe_name << " for NVIDIA application profile" << LL_ENDL;
+
+        // Add this exe to the profile
+        NVDRS_APPLICATION application;
+        application.version = NVDRS_APPLICATION_VER;
+        application.isPredefined = 0;
+        wsprintf(application.appName, L"%s", w_exe_name.c_str());
+        wsprintf(application.userFriendlyName, L"%s", w_exe_name.c_str());
+        wsprintf(application.launcher, L"%s", w_exe_name.c_str());
+        wsprintf(application.fileInFolder, L"%s", "");
+
+        status = NvAPI_DRS_CreateApplication(hSession, hProfile, &application);
+        if (status != NVAPI_OK)
+        {
+            nvapi_error(status);
+            return;
+        }
+
+        // Save application in case we added one
+        status = NvAPI_DRS_SaveSettings(hSession);
+        if (status != NVAPI_OK)
+        {
+            nvapi_error(status);
+            return;
+        }
+    }
+
+    // load settings for querying
+    status = NvAPI_DRS_LoadSettings(hSession);
+    if (status != NVAPI_OK)
+    {
+        nvapi_error(status);
+        return;
+    }
+
+    //get the preferred power management mode for Second Life
+    NVDRS_SETTING drsSetting = {0};
+    drsSetting.version = NVDRS_SETTING_VER;
+    status = NvAPI_DRS_GetSetting(hSession, hProfile, PREFERRED_PSTATE_ID, &drsSetting);
+    if (status == NVAPI_SETTING_NOT_FOUND)
+    { //only override if the user hasn't specifically set this setting
+        // (5) Specify that we want to enable maximum performance setting
+        // first we fill the NVDRS_SETTING struct, then we call the function
+        drsSetting.version = NVDRS_SETTING_VER;
+        drsSetting.settingId = PREFERRED_PSTATE_ID;
+        drsSetting.settingType = NVDRS_DWORD_TYPE;
+        drsSetting.u32CurrentValue = PREFERRED_PSTATE_PREFER_MAX;
+        status = NvAPI_DRS_SetSetting(hSession, hProfile, &drsSetting);
+        if (status != NVAPI_OK)
+        {
+            nvapi_error(status);
+            return;
+        }
 
         // (6) Now we apply (or save) our changes to the system
         status = NvAPI_DRS_SaveSettings(hSession);
-        if (status != NVAPI_OK) 
+        if (status != NVAPI_OK)
+        {
+            nvapi_error(status);
+            return;
+        }
+    }
+    else if (status != NVAPI_OK)
+    {
+        nvapi_error(status);
+        return;
+    }
+
+    // enable Threaded Optimization instead of letting the driver decide
+    status = NvAPI_DRS_GetSetting(hSession, hProfile, OGL_THREAD_CONTROL_ID, &drsSetting);
+    if (status == NVAPI_SETTING_NOT_FOUND || (status == NVAPI_OK && drsSetting.u32CurrentValue != OGL_THREAD_CONTROL_ENABLE))
+    {
+        drsSetting.version = NVDRS_SETTING_VER;
+        drsSetting.settingId = OGL_THREAD_CONTROL_ID;
+        drsSetting.settingType = NVDRS_DWORD_TYPE;
+        drsSetting.u32CurrentValue = OGL_THREAD_CONTROL_ENABLE;
+        status = NvAPI_DRS_SetSetting(hSession, hProfile, &drsSetting);
+        if (status != NVAPI_OK)
+        {
+            nvapi_error(status);
+            return;
+        }
+
+        // Now we apply (or save) our changes to the system
+        status = NvAPI_DRS_SaveSettings(hSession);
+        if (status != NVAPI_OK)
         {
             nvapi_error(status);
             return;
         }
-	}
-	else if (status != NVAPI_OK)
-	{
-		nvapi_error(status);
-		return;
-	}
-
-	// enable Threaded Optimization instead of letting the driver decide
-	status = NvAPI_DRS_GetSetting(hSession, hProfile, OGL_THREAD_CONTROL_ID, &drsSetting);
-	if (status == NVAPI_SETTING_NOT_FOUND || (status == NVAPI_OK && drsSetting.u32CurrentValue != OGL_THREAD_CONTROL_ENABLE))
-	{
-		drsSetting.version = NVDRS_SETTING_VER;
-		drsSetting.settingId = OGL_THREAD_CONTROL_ID;
-		drsSetting.settingType = NVDRS_DWORD_TYPE;
-		drsSetting.u32CurrentValue = OGL_THREAD_CONTROL_ENABLE;
-		status = NvAPI_DRS_SetSetting(hSession, hProfile, &drsSetting);
-		if (status != NVAPI_OK)
-		{
-			nvapi_error(status);
-			return;
-		}
-
-		// Now we apply (or save) our changes to the system
-		status = NvAPI_DRS_SaveSettings(hSession);
-		if (status != NVAPI_OK)
-		{
-			nvapi_error(status);
-			return;
-		}
-	}
-	else if (status != NVAPI_OK)
-	{
-		nvapi_error(status);
-		return;
-	}
+    }
+    else if (status != NVAPI_OK)
+    {
+        nvapi_error(status);
+        return;
+    }
 }
 
 //#define DEBUGGING_SEH_FILTER 1
 #if DEBUGGING_SEH_FILTER
-#	define WINMAIN DebuggingWinMain
+#   define WINMAIN DebuggingWinMain
 #else
-#	define WINMAIN wWinMain
+#   define WINMAIN wWinMain
 #endif
 
 int APIENTRY WINMAIN(HINSTANCE hInstance,
@@ -417,56 +417,56 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
     LL_PROFILER_FRAME_END;
     LL_PROFILER_SET_THREAD_NAME("App");
 
-	const S32 MAX_HEAPS = 255;
-	DWORD heap_enable_lfh_error[MAX_HEAPS];
-	S32 num_heaps = 0;
-	
-	LLWindowWin32::setDPIAwareness();
+    const S32 MAX_HEAPS = 255;
+    DWORD heap_enable_lfh_error[MAX_HEAPS];
+    S32 num_heaps = 0;
+
+    LLWindowWin32::setDPIAwareness();
 
 #if WINDOWS_CRT_MEM_CHECKS && !INCLUDE_VLD
-	_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); // dump memory leaks on exit
+    _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); // dump memory leaks on exit
 #elif 0
-	// Experimental - enable the low fragmentation heap
-	// This results in a 2-3x improvement in opening a new Inventory window (which uses a large numebr of allocations)
-	// Note: This won't work when running from the debugger unless the _NO_DEBUG_HEAP environment variable is set to 1
+    // Experimental - enable the low fragmentation heap
+    // This results in a 2-3x improvement in opening a new Inventory window (which uses a large numebr of allocations)
+    // Note: This won't work when running from the debugger unless the _NO_DEBUG_HEAP environment variable is set to 1
 
-	// Enable to get mem debugging within visual studio.
+    // Enable to get mem debugging within visual studio.
 #if LL_DEBUG
-	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #else
-	_CrtSetDbgFlag(0); // default, just making explicit
-	
-	ULONG ulEnableLFH = 2;
-	HANDLE* hHeaps = new HANDLE[MAX_HEAPS];
-	num_heaps = GetProcessHeaps(MAX_HEAPS, hHeaps);
-	for(S32 i = 0; i < num_heaps; i++)
-	{
-		bool success = HeapSetInformation(hHeaps[i], HeapCompatibilityInformation, &ulEnableLFH, sizeof(ulEnableLFH));
-		if (success)
-			heap_enable_lfh_error[i] = 0;
-		else
-			heap_enable_lfh_error[i] = GetLastError();
-	}
+    _CrtSetDbgFlag(0); // default, just making explicit
+
+    ULONG ulEnableLFH = 2;
+    HANDLE* hHeaps = new HANDLE[MAX_HEAPS];
+    num_heaps = GetProcessHeaps(MAX_HEAPS, hHeaps);
+    for(S32 i = 0; i < num_heaps; i++)
+    {
+        bool success = HeapSetInformation(hHeaps[i], HeapCompatibilityInformation, &ulEnableLFH, sizeof(ulEnableLFH));
+        if (success)
+            heap_enable_lfh_error[i] = 0;
+        else
+            heap_enable_lfh_error[i] = GetLastError();
+    }
 #endif
 #endif
-	
-	// *FIX: global
-	gIconResource = MAKEINTRESOURCE(IDI_LL_ICON);
 
-	LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(ll_convert_wide_to_string(pCmdLine).c_str());
+    // *FIX: global
+    gIconResource = MAKEINTRESOURCE(IDI_LL_ICON);
 
-	gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
+    LLAppViewerWin32* viewer_app_ptr = new LLAppViewerWin32(ll_convert_wide_to_string(pCmdLine).c_str());
 
-	// Set a debug info flag to indicate if multiple instances are running.
-	bool found_other_instance = !create_app_mutex();
-	gDebugInfo["FoundOtherInstanceAtStartup"] = LLSD::Boolean(found_other_instance);
+    gOldTerminateHandler = std::set_terminate(exceptionTerminateHandler);
 
-	bool ok = viewer_app_ptr->init();
-	if(!ok)
-	{
-		LL_WARNS() << "Application init failed." << LL_ENDL;
-		return -1;
-	}
+    // Set a debug info flag to indicate if multiple instances are running.
+    bool found_other_instance = !create_app_mutex();
+    gDebugInfo["FoundOtherInstanceAtStartup"] = LLSD::Boolean(found_other_instance);
+
+    bool ok = viewer_app_ptr->init();
+    if(!ok)
+    {
+        LL_WARNS() << "Application init failed." << LL_ENDL;
+        return -1;
+    }
 
     NvDRSSessionHandle hSession = 0;
     static LLCachedControl<bool> use_nv_api(gSavedSettings, "NvAPICreateApplicationProfile", true);
@@ -493,70 +493,70 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
         }
     }
 
-	// Have to wait until after logging is initialized to display LFH info
-	if (num_heaps > 0)
-	{
-		LL_INFOS() << "Attempted to enable LFH for " << num_heaps << " heaps." << LL_ENDL;
-		for(S32 i = 0; i < num_heaps; i++)
-		{
-			if (heap_enable_lfh_error[i])
-			{
-				LL_INFOS() << "  Failed to enable LFH for heap: " << i << " Error: " << heap_enable_lfh_error[i] << LL_ENDL;
-			}
-		}
-	}
-	
-	// Run the application main loop
-	while (! viewer_app_ptr->frame()) 
-	{}
-
-	if (!LLApp::isError())
-	{
-		//
-		// We don't want to do cleanup here if the error handler got called -
-		// the assumption is that the error handler is responsible for doing
-		// app cleanup if there was a problem.
-		//
+    // Have to wait until after logging is initialized to display LFH info
+    if (num_heaps > 0)
+    {
+        LL_INFOS() << "Attempted to enable LFH for " << num_heaps << " heaps." << LL_ENDL;
+        for(S32 i = 0; i < num_heaps; i++)
+        {
+            if (heap_enable_lfh_error[i])
+            {
+                LL_INFOS() << "  Failed to enable LFH for heap: " << i << " Error: " << heap_enable_lfh_error[i] << LL_ENDL;
+            }
+        }
+    }
+
+    // Run the application main loop
+    while (! viewer_app_ptr->frame())
+    {}
+
+    if (!LLApp::isError())
+    {
+        //
+        // We don't want to do cleanup here if the error handler got called -
+        // the assumption is that the error handler is responsible for doing
+        // app cleanup if there was a problem.
+        //
 #if WINDOWS_CRT_MEM_CHECKS
-		LL_INFOS() << "CRT Checking memory:" << LL_ENDL;
-		if (!_CrtCheckMemory())
-		{
-			LL_WARNS() << "_CrtCheckMemory() failed at prior to cleanup!" << LL_ENDL;
-		}
-		else
-		{
-			LL_INFOS() << " No corruption detected." << LL_ENDL;
-		}
+        LL_INFOS() << "CRT Checking memory:" << LL_ENDL;
+        if (!_CrtCheckMemory())
+        {
+            LL_WARNS() << "_CrtCheckMemory() failed at prior to cleanup!" << LL_ENDL;
+        }
+        else
+        {
+            LL_INFOS() << " No corruption detected." << LL_ENDL;
+        }
 #endif
 
-		gGLActive = TRUE;
+        gGLActive = TRUE;
 
-		viewer_app_ptr->cleanup();
+        viewer_app_ptr->cleanup();
 
 #if WINDOWS_CRT_MEM_CHECKS
-		LL_INFOS() << "CRT Checking memory:" << LL_ENDL;
-		if (!_CrtCheckMemory())
-		{
-			LL_WARNS() << "_CrtCheckMemory() failed after cleanup!" << LL_ENDL;
-		}
-		else
-		{
-			LL_INFOS() << " No corruption detected." << LL_ENDL;
-		}
+        LL_INFOS() << "CRT Checking memory:" << LL_ENDL;
+        if (!_CrtCheckMemory())
+        {
+            LL_WARNS() << "_CrtCheckMemory() failed after cleanup!" << LL_ENDL;
+        }
+        else
+        {
+            LL_INFOS() << " No corruption detected." << LL_ENDL;
+        }
 #endif
 
-	}
-	delete viewer_app_ptr;
-	viewer_app_ptr = NULL;
-
-	// (NVAPI) (6) We clean up. This is analogous to doing a free()
-	if (hSession)
-	{
-		NvAPI_DRS_DestroySession(hSession);
-		hSession = 0;
-	}
-	
-	return 0;
+    }
+    delete viewer_app_ptr;
+    viewer_app_ptr = NULL;
+
+    // (NVAPI) (6) We clean up. This is analogous to doing a free()
+    if (hSession)
+    {
+        NvAPI_DRS_DestroySession(hSession);
+        hSession = 0;
+    }
+
+    return 0;
 }
 
 #if DEBUGGING_SEH_FILTER
@@ -582,16 +582,16 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
 
 void LLAppViewerWin32::disableWinErrorReporting()
 {
-	std::string executable_name = gDirUtilp->getExecutableFilename();
-
-	if( S_OK == WerAddExcludedApplication( utf8str_to_utf16str(executable_name).c_str(), FALSE ) )
-	{
-		LL_INFOS() << "WerAddExcludedApplication() succeeded for " << executable_name << LL_ENDL;
-	}
-	else
-	{
-		LL_INFOS() << "WerAddExcludedApplication() failed for " << executable_name << LL_ENDL;
-	}
+    std::string executable_name = gDirUtilp->getExecutableFilename();
+
+    if( S_OK == WerAddExcludedApplication( utf8str_to_utf16str(executable_name).c_str(), FALSE ) )
+    {
+        LL_INFOS() << "WerAddExcludedApplication() succeeded for " << executable_name << LL_ENDL;
+    }
+    else
+    {
+        LL_INFOS() << "WerAddExcludedApplication() failed for " << executable_name << LL_ENDL;
+    }
 }
 
 const S32 MAX_CONSOLE_LINES = 7500;
@@ -666,8 +666,8 @@ void set_stream(const char* desc, FILE* fp, DWORD handle_id, const char* name, c
 } // anonymous namespace
 
 LLAppViewerWin32::LLAppViewerWin32(const char* cmd_line) :
-	mCmdLine(cmd_line),
-	mIsConsoleAllocated(false)
+    mCmdLine(cmd_line),
+    mIsConsoleAllocated(false)
 {
 }
 
@@ -677,18 +677,18 @@ LLAppViewerWin32::~LLAppViewerWin32()
 
 bool LLAppViewerWin32::init()
 {
-	// Platform specific initialization.
-	
-	// Turn off Windows Error Reporting
-	// (Don't send our data to Microsoft--at least until we are Logo approved and have a way
-	// of getting the data back from them.)
-	//
-	// LL_INFOS() << "Turning off Windows error reporting." << LL_ENDL;
-	disableWinErrorReporting();
+    // Platform specific initialization.
+
+    // Turn off Windows Error Reporting
+    // (Don't send our data to Microsoft--at least until we are Logo approved and have a way
+    // of getting the data back from them.)
+    //
+    // LL_INFOS() << "Turning off Windows error reporting." << LL_ENDL;
+    disableWinErrorReporting();
 
 #ifndef LL_RELEASE_FOR_DOWNLOAD
-	// Merely requesting the LLSingleton instance initializes it.
-	LLWinDebug::instance();
+    // Merely requesting the LLSingleton instance initializes it.
+    LLWinDebug::instance();
 #endif
 
 #if LL_SEND_CRASH_REPORTS
@@ -787,24 +787,24 @@ bool LLAppViewerWin32::init()
 #endif // LL_BUGSPLAT
 #endif // LL_SEND_CRASH_REPORTS
 
-	bool success = LLAppViewer::init();
+    bool success = LLAppViewer::init();
 
     return success;
 }
 
 bool LLAppViewerWin32::cleanup()
 {
-	bool result = LLAppViewer::cleanup();
+    bool result = LLAppViewer::cleanup();
 
-	gDXHardware.cleanup();
+    gDXHardware.cleanup();
 
-	if (mIsConsoleAllocated)
-	{
-		FreeConsole();
-		mIsConsoleAllocated = false;
-	}
+    if (mIsConsoleAllocated)
+    {
+        FreeConsole();
+        mIsConsoleAllocated = false;
+    }
 
-	return result;
+    return result;
 }
 
 void LLAppViewerWin32::reportCrashToBugsplat(void* pExcepInfo)
@@ -819,123 +819,123 @@ void LLAppViewerWin32::reportCrashToBugsplat(void* pExcepInfo)
 
 void LLAppViewerWin32::initLoggingAndGetLastDuration()
 {
-	LLAppViewer::initLoggingAndGetLastDuration();
+    LLAppViewer::initLoggingAndGetLastDuration();
 }
 
 void LLAppViewerWin32::initConsole()
 {
-	// pop up debug console
-	mIsConsoleAllocated = create_console();
-	return LLAppViewer::initConsole();
+    // pop up debug console
+    mIsConsoleAllocated = create_console();
+    return LLAppViewer::initConsole();
 }
 
 void write_debug_dx(const char* str)
 {
-	std::string value = gDebugInfo["DXInfo"].asString();
-	value += str;
-	gDebugInfo["DXInfo"] = value;
+    std::string value = gDebugInfo["DXInfo"].asString();
+    value += str;
+    gDebugInfo["DXInfo"] = value;
 }
 
 void write_debug_dx(const std::string& str)
 {
-	write_debug_dx(str.c_str());
+    write_debug_dx(str.c_str());
 }
 
 bool LLAppViewerWin32::initHardwareTest()
 {
-	//
-	// Do driver verification and initialization based on DirectX
-	// hardware polling and driver versions
-	//
-	if (TRUE == gSavedSettings.getBOOL("ProbeHardwareOnStartup") && FALSE == gSavedSettings.getBOOL("NoHardwareProbe"))
-	{
-		// per DEV-11631 - disable hardware probing for everything
-		// but vram.
-		BOOL vram_only = TRUE;
-
-		LLSplashScreen::update(LLTrans::getString("StartupDetectingHardware"));
-
-		LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
-		gDXHardware.setWriteDebugFunc(write_debug_dx);
-		BOOL probe_ok = gDXHardware.getInfo(vram_only);
-
-		if (!probe_ok
-			&& gWarningSettings.getBOOL("AboutDirectX9"))
-		{
-			LL_WARNS("AppInit") << "DirectX probe failed, alerting user." << LL_ENDL;
-
-			// Warn them that runnin without DirectX 9 will
-			// not allow us to tell them about driver issues
-			std::ostringstream msg;
-			msg << LLTrans::getString ("MBNoDirectX");
-			S32 button = OSMessageBox(
-				msg.str(),
-				LLTrans::getString("MBWarning"),
-				OSMB_YESNO);
-			if (OSBTN_NO== button)
-			{
-				LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL;
-				LLWeb::loadURLExternal("http://secondlife.com/support/", false);
-				return false;
-			}
-			gWarningSettings.setBOOL("AboutDirectX9", FALSE);
-		}
-		LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL;
-
-		// Only probe once after installation
-		gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
-
-		// Disable so debugger can work
-		std::string splash_msg;
-		LLStringUtil::format_map_t args;
-		args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
-		splash_msg = LLTrans::getString("StartupLoading", args);
-
-		LLSplashScreen::update(splash_msg);
-	}
-
-	if (!restoreErrorTrap())
-	{
-		LL_WARNS("AppInit") << " Someone took over my exception handler (post hardware probe)!" << LL_ENDL;
-	}
-
-	if (gGLManager.mVRAM == 0)
-	{
-		gGLManager.mVRAM = gDXHardware.getVRAM();
-	}
-
-	LL_INFOS("AppInit") << "Detected VRAM: " << gGLManager.mVRAM << LL_ENDL;
-
-	return true;
+    //
+    // Do driver verification and initialization based on DirectX
+    // hardware polling and driver versions
+    //
+    if (TRUE == gSavedSettings.getBOOL("ProbeHardwareOnStartup") && FALSE == gSavedSettings.getBOOL("NoHardwareProbe"))
+    {
+        // per DEV-11631 - disable hardware probing for everything
+        // but vram.
+        BOOL vram_only = TRUE;
+
+        LLSplashScreen::update(LLTrans::getString("StartupDetectingHardware"));
+
+        LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
+        gDXHardware.setWriteDebugFunc(write_debug_dx);
+        BOOL probe_ok = gDXHardware.getInfo(vram_only);
+
+        if (!probe_ok
+            && gWarningSettings.getBOOL("AboutDirectX9"))
+        {
+            LL_WARNS("AppInit") << "DirectX probe failed, alerting user." << LL_ENDL;
+
+            // Warn them that runnin without DirectX 9 will
+            // not allow us to tell them about driver issues
+            std::ostringstream msg;
+            msg << LLTrans::getString ("MBNoDirectX");
+            S32 button = OSMessageBox(
+                msg.str(),
+                LLTrans::getString("MBWarning"),
+                OSMB_YESNO);
+            if (OSBTN_NO== button)
+            {
+                LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL;
+                LLWeb::loadURLExternal("http://secondlife.com/support/", false);
+                return false;
+            }
+            gWarningSettings.setBOOL("AboutDirectX9", FALSE);
+        }
+        LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL;
+
+        // Only probe once after installation
+        gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE);
+
+        // Disable so debugger can work
+        std::string splash_msg;
+        LLStringUtil::format_map_t args;
+        args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
+        splash_msg = LLTrans::getString("StartupLoading", args);
+
+        LLSplashScreen::update(splash_msg);
+    }
+
+    if (!restoreErrorTrap())
+    {
+        LL_WARNS("AppInit") << " Someone took over my exception handler (post hardware probe)!" << LL_ENDL;
+    }
+
+    if (gGLManager.mVRAM == 0)
+    {
+        gGLManager.mVRAM = gDXHardware.getVRAM();
+    }
+
+    LL_INFOS("AppInit") << "Detected VRAM: " << gGLManager.mVRAM << LL_ENDL;
+
+    return true;
 }
 
 bool LLAppViewerWin32::initParseCommandLine(LLCommandLineParser& clp)
 {
-	if (!clp.parseCommandLineString(mCmdLine))
-	{
-		return false;
-	}
-
-	// Find the system language.
-	FL_Locale *locale = NULL;
-	FL_Success success = FL_FindLocale(&locale, FL_MESSAGES);
-	if (success != 0)
-	{
-		if (success >= 2 && locale->lang) // confident!
-		{
-			LL_INFOS("AppInit") << "Language: " << ll_safe_string(locale->lang) << LL_ENDL;
-			LL_INFOS("AppInit") << "Location: " << ll_safe_string(locale->country) << LL_ENDL;
-			LL_INFOS("AppInit") << "Variant: " << ll_safe_string(locale->variant) << LL_ENDL;
-			LLControlVariable* c = gSavedSettings.getControl("SystemLanguage");
-			if(c)
-			{
-				c->setValue(std::string(locale->lang), false);
-			}
-		}
-	}
-	FL_FreeLocale(&locale);
-
-	return true;
+    if (!clp.parseCommandLineString(mCmdLine))
+    {
+        return false;
+    }
+
+    // Find the system language.
+    FL_Locale *locale = NULL;
+    FL_Success success = FL_FindLocale(&locale, FL_MESSAGES);
+    if (success != 0)
+    {
+        if (success >= 2 && locale->lang) // confident!
+        {
+            LL_INFOS("AppInit") << "Language: " << ll_safe_string(locale->lang) << LL_ENDL;
+            LL_INFOS("AppInit") << "Location: " << ll_safe_string(locale->country) << LL_ENDL;
+            LL_INFOS("AppInit") << "Variant: " << ll_safe_string(locale->variant) << LL_ENDL;
+            LLControlVariable* c = gSavedSettings.getControl("SystemLanguage");
+            if(c)
+            {
+                c->setValue(std::string(locale->lang), false);
+            }
+        }
+    }
+    FL_FreeLocale(&locale);
+
+    return true;
 }
 
 bool LLAppViewerWin32::beingDebugged()
@@ -944,63 +944,63 @@ bool LLAppViewerWin32::beingDebugged()
 }
 
 bool LLAppViewerWin32::restoreErrorTrap()
-{	
-	return true; // we don't check for handler collisions on windows, so just say they're ok
+{
+    return true; // we don't check for handler collisions on windows, so just say they're ok
 }
 
 //virtual
 bool LLAppViewerWin32::sendURLToOtherInstance(const std::string& url)
 {
-	wchar_t window_class[256]; /* Flawfinder: ignore */   // Assume max length < 255 chars.
-	mbstowcs(window_class, sWindowClass.c_str(), 255);
-	window_class[255] = 0;
-	// Use the class instead of the window name.
-	HWND other_window = FindWindow(window_class, NULL);
-
-	if (other_window != NULL)
-	{
-		LL_DEBUGS() << "Found other window with the name '" << getWindowTitle() << "'" << LL_ENDL;
-		COPYDATASTRUCT cds;
-		const S32 SLURL_MESSAGE_TYPE = 0;
-		cds.dwData = SLURL_MESSAGE_TYPE;
-		cds.cbData = url.length() + 1;
-		cds.lpData = (void*)url.c_str();
-
-		LRESULT msg_result = SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
-		LL_DEBUGS() << "SendMessage(WM_COPYDATA) to other window '" 
-				 << getWindowTitle() << "' returned " << msg_result << LL_ENDL;
-		return true;
-	}
-	return false;
+    wchar_t window_class[256]; /* Flawfinder: ignore */   // Assume max length < 255 chars.
+    mbstowcs(window_class, sWindowClass.c_str(), 255);
+    window_class[255] = 0;
+    // Use the class instead of the window name.
+    HWND other_window = FindWindow(window_class, NULL);
+
+    if (other_window != NULL)
+    {
+        LL_DEBUGS() << "Found other window with the name '" << getWindowTitle() << "'" << LL_ENDL;
+        COPYDATASTRUCT cds;
+        const S32 SLURL_MESSAGE_TYPE = 0;
+        cds.dwData = SLURL_MESSAGE_TYPE;
+        cds.cbData = url.length() + 1;
+        cds.lpData = (void*)url.c_str();
+
+        LRESULT msg_result = SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
+        LL_DEBUGS() << "SendMessage(WM_COPYDATA) to other window '"
+                 << getWindowTitle() << "' returned " << msg_result << LL_ENDL;
+        return true;
+    }
+    return false;
 }
 
 
 std::string LLAppViewerWin32::generateSerialNumber()
 {
-	char serial_md5[MD5HEX_STR_SIZE];		// Flawfinder: ignore
-	serial_md5[0] = 0;
-
-	DWORD serial = 0;
-	DWORD flags = 0;
-	BOOL success = GetVolumeInformation(
-			L"C:\\",
-			NULL,		// volume name buffer
-			0,			// volume name buffer size
-			&serial,	// volume serial
-			NULL,		// max component length
-			&flags,		// file system flags
-			NULL,		// file system name buffer
-			0);			// file system name buffer size
-	if (success)
-	{
-		LLMD5 md5;
-		md5.update( (unsigned char*)&serial, sizeof(DWORD));
-		md5.finalize();
-		md5.hex_digest(serial_md5);
-	}
-	else
-	{
-		LL_WARNS() << "GetVolumeInformation failed" << LL_ENDL;
-	}
-	return serial_md5;
+    char serial_md5[MD5HEX_STR_SIZE];       // Flawfinder: ignore
+    serial_md5[0] = 0;
+
+    DWORD serial = 0;
+    DWORD flags = 0;
+    BOOL success = GetVolumeInformation(
+            L"C:\\",
+            NULL,       // volume name buffer
+            0,          // volume name buffer size
+            &serial,    // volume serial
+            NULL,       // max component length
+            &flags,     // file system flags
+            NULL,       // file system name buffer
+            0);         // file system name buffer size
+    if (success)
+    {
+        LLMD5 md5;
+        md5.update( (unsigned char*)&serial, sizeof(DWORD));
+        md5.finalize();
+        md5.hex_digest(serial_md5);
+    }
+    else
+    {
+        LL_WARNS() << "GetVolumeInformation failed" << LL_ENDL;
+    }
+    return serial_md5;
 }