1 files changed, 19 insertions, 19 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f54093d9d0..b26b72c2ed 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -566,13 +566,13 @@ static void settings_to_globals()
 
 static void settings_modify()
 {
-    LLPipeline::sRenderTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater");
-    LLPipeline::sRenderBump             = gSavedSettings.getBOOL("RenderObjectBump");
+    LLPipeline::sRenderTransparentWater	= gSavedSettings.getBOOL("RenderTransparentWater");
+    LLPipeline::sRenderBump				= gSavedSettings.getBOOL("RenderObjectBump");
     LLPipeline::sRenderDeferred         = LLPipeline::sRenderBump && gSavedSettings.getBOOL("RenderDeferred");
     LLRenderTarget::sUseFBO             = LLPipeline::sRenderDeferred;
-    LLVOSurfacePatch::sLODFactor        = gSavedSettings.getF32("RenderTerrainLODFactor");
-    LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor;  // square lod factor to get exponential range of [1,4]
-    gDebugGL       = gDebugGLSession || gDebugSession;
+    LLVOSurfacePatch::sLODFactor		= gSavedSettings.getF32("RenderTerrainLODFactor");
+    LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4]
+    gDebugGL = gSavedSettings.getBOOL("RenderDebugGL") || gDebugSession;
     gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline");
 }
 
@@ -958,8 +958,8 @@ bool LLAppViewer::init()
 	if (!gGLManager.mHasRequirements)
 	{
         // already handled with a MBVideoDrvErr
-		return 0;
-	}
+        return 0;
+    }
 
 	// Without SSE2 support we will crash almost immediately, warn here.
 	if (!gSysCPU.hasSSE2())
@@ -1306,12 +1306,12 @@ void LLAppViewer::initMaxHeapSize()
 	//currently SL is built under 32-bit setting, we set its max heap size no more than 1.6 GB.
 
  #ifndef LL_X86_64
-    F32Gigabytes max_heap_size_gb = (F32Gigabytes)gSavedSettings.getF32("MaxHeapSize") ;
+	F32Gigabytes max_heap_size_gb = (F32Gigabytes)gSavedSettings.getF32("MaxHeapSize") ;
 #else
     F32Gigabytes max_heap_size_gb = (F32Gigabytes)gSavedSettings.getF32("MaxHeapSize64");
 #endif
 
-    LLMemory::initMaxHeapSizeGB(max_heap_size_gb);
+	LLMemory::initMaxHeapSizeGB(max_heap_size_gb);
 }
 
 static LLTrace::BlockTimerStatHandle FTM_MESSAGES("System Messages");
@@ -1477,18 +1477,18 @@ bool LLAppViewer::doFrame()
 			{
 				{
 					LL_PROFILE_ZONE_NAMED_CATEGORY_APP( "df pauseMainloopTimeout" )
-					pauseMainloopTimeout(); // *TODO: Remove. Messages shouldn't be stalling for 20+ seconds!
+				pauseMainloopTimeout(); // *TODO: Remove. Messages shouldn't be stalling for 20+ seconds!
 				}
 
 				{
 					LL_PROFILE_ZONE_NAMED_CATEGORY_APP("df idle"); //LL_RECORD_BLOCK_TIME(FTM_IDLE);
-					idle();
+				idle();
 				}
 
 				{
 					LL_PROFILE_ZONE_NAMED_CATEGORY_APP( "df resumeMainloopTimeout" )
-					resumeMainloopTimeout();
-				}
+				resumeMainloopTimeout();
+			}
 			}
 
 			if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED))
@@ -2678,7 +2678,7 @@ bool LLAppViewer::initConfiguration()
                 const std::string& name = *itr;
                 const std::string& value = *(++itr);
                 if (!tempSetControl(name,value))
-                {
+				{
 					LL_WARNS() << "Failed --set " << name << ": setting name unknown." << LL_ENDL;
                 }
             }
@@ -4343,12 +4343,12 @@ bool LLAppViewer::initCache()
 	{
 		if (mPurgeCache)
 		{
-		LLSplashScreen::update(LLTrans::getString("StartupClearingCache"));
-		purgeCache();
+			LLSplashScreen::update(LLTrans::getString("StartupClearingCache"));
+			purgeCache();
 
 			// clear the new C++ file system based cache
 			LLDiskCache::getInstance()->clearCache();
-	}
+		}
 		else
 		{
 			// purge excessive files from the new file system based cache
@@ -4375,7 +4375,7 @@ bool LLAppViewer::initCache()
 
 	LLVOCache::getInstance()->initCache(LL_PATH_CACHE, gSavedSettings.getU32("CacheNumberOfRegionsForObjects"), getObjectCacheVersion());
 
-		return true;
+    return true;
 }
 
 void LLAppViewer::addOnIdleCallback(const boost::function<void()>& cb)
@@ -5012,7 +5012,7 @@ void LLAppViewer::idle()
 
 	{
 		LL_PROFILE_ZONE_NAMED_CATEGORY_APP("world update"); //LL_RECORD_BLOCK_TIME(FTM_WORLD_UPDATE);
-		gPipeline.updateMove();
+	gPipeline.updateMove();
 	}
 
 	LLWorld::getInstance()->updateParticles();