More cleanup from self-reviewing headless client changes

indra/llwindow/llwindowheadless.cpp

@@ -28,7 +28,6 @@
 #include "indra_constants.h"
 
 #include "llwindowheadless.h"
-#include "llgl.h"
 
 //
 // LLWindowHeadless

indra/newview/llappviewer.cpp

@@ -2640,8 +2640,7 @@ bool LLAppViewer::initWindow()
 	LL_INFOS("AppInit") << "Initializing window..." << LL_ENDL;
 
 	// store setting in a global for easy access and modification
-	gHeadlessClient = gSavedSettings.getBOOL("DisableRendering") 
-				   || gSavedSettings.getBOOL("HeadlessClient");
+	gHeadlessClient = gSavedSettings.getBOOL("HeadlessClient");
 
 	// always start windowed
 	BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");