diff options
| author | Don Kjer <don@lindenlab.com> | 2011-02-18 23:53:38 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-02-18 23:53:38 +0000 |
| commit | 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (patch) | |
| tree | 5f1b8d086a61c62cdf5bdc87680522a7eb66e389 /indra | |
| parent | 774405e92bec6bdfa9e2be28e04b4b47fd71615e (diff) | |
More cleanup from self-reviewing headless client changes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llwindow/llwindowheadless.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp index 2e811ab23f..35398f1c09 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 25bdaed0c9..0595d6f3c7 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"); |