1 files changed, 38 insertions, 39 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index d6c6eb6a98..529db397b2 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1729,12 +1729,12 @@ void LLAppViewer::flushVFSIO()
 
 bool LLAppViewer::cleanup()
 {
-    LLAtmosphere::cleanupClass();
+	LLAtmosphere::cleanupClass();
 
 	//ditch LLVOAvatarSelf instance
 	gAgentAvatarp = NULL;
 
-     LLNotifications::instance().clear();
+	 LLNotifications::instance().clear();
 
 	// workaround for DEV-35406 crash on shutdown
 	LLEventPumps::instance().reset();
@@ -1771,14 +1771,14 @@ bool LLAppViewer::cleanup()
 	// to ensure shutdown order
 	LLMortician::setZealous(TRUE);
 
-    // Give any remaining SLPlugin instances a chance to exit cleanly.
-    LLPluginProcessParent::shutdown();
+	// Give any remaining SLPlugin instances a chance to exit cleanly.
+	LLPluginProcessParent::shutdown();
 
 	disconnectViewer();
-    LLViewerCamera::deleteSingleton();
+	LLViewerCamera::deleteSingleton();
 
 	LL_INFOS() << "Viewer disconnected" << LL_ENDL;
-	
+
 	if (gKeyboard)
 	{
 		gKeyboard->resetKeys();
@@ -1843,15 +1843,15 @@ bool LLAppViewer::cleanup()
 
 	if (gAudiop)
 	{
-        // be sure to stop the internet stream cleanly BEFORE destroying the interface to stop it.
-        gAudiop->stopInternetStream();
-        // shut down the streaming audio sub-subsystem first, in case it relies on not outliving the general audio subsystem.
-        LLStreamingAudioInterface *sai = gAudiop->getStreamingAudioImpl();
+		// be sure to stop the internet stream cleanly BEFORE destroying the interface to stop it.
+		gAudiop->stopInternetStream();
+		// shut down the streaming audio sub-subsystem first, in case it relies on not outliving the general audio subsystem.
+		LLStreamingAudioInterface *sai = gAudiop->getStreamingAudioImpl();
 		delete sai;
 		gAudiop->setStreamingAudioImpl(NULL);
 
-        // shut down the audio subsystem
-        gAudiop->shutdown();
+		// shut down the audio subsystem
+		gAudiop->shutdown();
 
 		delete gAudiop;
 		gAudiop = NULL;
@@ -1920,11 +1920,11 @@ bool LLAppViewer::cleanup()
 	delete gKeyboard;
 	gKeyboard = NULL;
 
-    if (LLViewerJoystick::instanceExists())
-    {
-        // Turn off Space Navigator and similar devices
-        LLViewerJoystick::getInstance()->terminate();
-    }
+	if (LLViewerJoystick::instanceExists())
+	{
+		// Turn off Space Navigator and similar devices
+		LLViewerJoystick::getInstance()->terminate();
+	}
 
 	LL_INFOS() << "Cleaning up Objects" << LL_ENDL;
 
@@ -1976,11 +1976,11 @@ bool LLAppViewer::cleanup()
 	// Store the time of our current logoff
 	gSavedPerAccountSettings.setU32("LastLogoff", time_corrected());
 
-    if (LLEnvironment::instanceExists())
-    {
-        //Store environment settings if nessesary
-        LLEnvironment::getInstance()->saveToSettings();
-    }
+	if (LLEnvironment::instanceExists())
+	{
+		//Store environment settings if necessary
+		LLEnvironment::getInstance()->saveToSettings();
+	}
 
 	// Must do this after all panels have been deleted because panels that have persistent rects
 	// save their rects on delete.
@@ -2030,7 +2030,7 @@ bool LLAppViewer::cleanup()
 		LLConversationLog::instance().cache();
     }
 
-    clearSecHandler();
+	clearSecHandler();
 
 	if (mPurgeCacheOnExit)
 	{
@@ -2073,13 +2073,13 @@ bool LLAppViewer::cleanup()
 		}
 	}
 
-    if (mPurgeUserDataOnExit)
-    {
-        // Ideally we should not save anything from this session since it is going to be purged now,
-        // but this is a very 'rare' case (user deleting himself), not worth overcomplicating 'save&cleanup' code
-        std::string user_path = gDirUtilp->getOSUserAppDir() + gDirUtilp->getDirDelimiter() + LLStartUp::getUserId();
-        gDirUtilp->deleteDirAndContents(user_path);
-    }
+	if (mPurgeUserDataOnExit)
+	{
+		// Ideally we should not save anything from this session since it is going to be purged now,
+		// but this is a very 'rare' case (user deleting himself), not worth overcomplicating 'save&cleanup' code
+		std::string user_path = gDirUtilp->getOSUserAppDir() + gDirUtilp->getDirDelimiter() + LLStartUp::getUserId();
+		gDirUtilp->deleteDirAndContents(user_path);
+	}
 
 	// Delete workers first
 	// shotdown all worker threads before deleting them in case of co-dependencies
@@ -2102,11 +2102,11 @@ bool LLAppViewer::cleanup()
 
 	//MUST happen AFTER SUBSYSTEM_CLEANUP(LLCurl)
 	delete sTextureCache;
-    sTextureCache = NULL;
+	sTextureCache = NULL;
 	delete sTextureFetch;
-    sTextureFetch = NULL;
+	sTextureFetch = NULL;
 	delete sImageDecodeThread;
-    sImageDecodeThread = NULL;
+	sImageDecodeThread = NULL;
 	delete mFastTimerLogThread;
 	mFastTimerLogThread = NULL;
 
@@ -2182,15 +2182,15 @@ bool LLAppViewer::cleanup()
 	// make sure nothing uses applyProxySettings by this point.
 	LL_INFOS() << "Cleaning up LLProxy." << LL_ENDL;
 	SUBSYSTEM_CLEANUP(LLProxy);
-    LLCore::LLHttp::cleanup();
+	LLCore::LLHttp::cleanup();
 
 	ll_close_fail_log();
 
 	LLError::LLCallStacks::cleanup();
 
-    LLEnvironment::deleteSingleton();
-    LLSelectMgr::deleteSingleton();
-    LLViewerEventRecorder::deleteSingleton();
+	LLEnvironment::deleteSingleton();
+	LLSelectMgr::deleteSingleton();
+	LLViewerEventRecorder::deleteSingleton();
 
 	// It's not at first obvious where, in this long sequence, a generic cleanup
 	// call OUGHT to go. So let's say this: as we migrate cleanup from
@@ -2203,8 +2203,7 @@ bool LLAppViewer::cleanup()
 	// deleteSingleton() methods.
 	LLSingletonBase::deleteAll();
 
-
-    LL_INFOS() << "Goodbye!" << LL_ENDL;
+	LL_INFOS() << "Goodbye!" << LL_ENDL;
 
 	removeDumpDir();