summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-01 15:50:25 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-01 15:50:25 +0100
commit8dd85013865cc5b426234cd71b605d7208bcfe01 (patch)
treefbdc7f1462df94a7da2c84d8168570b7651d13a4 /indra/newview/pipeline.cpp
parent37e8fd20c3823482f3a15b4bfd544f7847070db8 (diff)
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index e80b5cc9ef..27db6778eb 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -116,8 +116,6 @@
#include "llenvironment.h"
-#pragma optimize("", off)
-
#ifdef _DEBUG
// Debug indices is disabled for now for debug performance - djs 4/24/02
//#define DEBUG_INDICES