summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-07-03 01:06:04 +0000
committerDon Kjer <don@lindenlab.com>2012-07-03 01:06:04 +0000
commit5904976435873b0b3c4f39a2514aef38bee22a39 (patch)
tree76f33d513fd545215cb40033867da3c4e02f9e71 /indra/newview
parented5b46c9b0f71b458f8dd58a9c76ae51f974726b (diff)
Added more rendering-code early-exits when in headless mode.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerwindow.cpp1
-rw-r--r--indra/newview/pipeline.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 7afb135470..ed970b84a7 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1712,6 +1712,7 @@ LLViewerWindow::LLViewerWindow(const Params& p)
void LLViewerWindow::initGLDefaults()
{
+ if (gHeadlessClient) return;
gGL.setSceneBlendType(LLRender::BT_ALPHA);
if (!LLGLSLShader::sNoFixedFunction)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 49c4f37871..de72d79043 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1105,6 +1105,7 @@ void LLPipeline::releaseScreenBuffers()
void LLPipeline::createGLBuffers()
{
+ if (gHeadlessClient) return;
stop_glerror();
LLMemType mt_cb(LLMemType::MTYPE_PIPELINE_CREATE_BUFFERS);
assertInitialized();