From 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 18 Feb 2011 23:53:38 +0000
Subject: [PATCH] More cleanup from self-reviewing headless client changes
---
indra/llwindow/llwindowheadless.cpp | 1 -
indra/newview/llappviewer.cpp | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp
index 2e811ab23fa..35398f1c099 100644
--- a/indra/llwindow/llwindowheadless.cpp
+++ b/indra/llwindow/llwindowheadless.cpp
@@ -28,7 +28,6 @@
#include "indra_constants.h"
#include "llwindowheadless.h"
-#include "llgl.h"
//
// LLWindowHeadless
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 25bdaed0c90..0595d6f3c73 100644
--- a/indra/newview/llappviewer.cpp
+++ b/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");
--
GitLab