diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:50:25 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-01 15:50:25 +0100 |
| commit | 8dd85013865cc5b426234cd71b605d7208bcfe01 (patch) | |
| tree | fbdc7f1462df94a7da2c84d8168570b7651d13a4 /indra/newview | |
| parent | 37e8fd20c3823482f3a15b4bfd544f7847070db8 (diff) | |
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index e9c27a7794..2650f69a2f 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -58,8 +58,6 @@ #include "llatmosphere.h" -#pragma optimize("", off) - //define EXPORT_PRESETS 1 //========================================================================= namespace diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index d5bcbd1894..451a0fb326 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -58,8 +58,6 @@ #include "llassetstorage.h" #include "llvfile.h" -#pragma optimize("", off) - #undef VERIFY_LEGACY_CONVERSION //========================================================================= diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 6837c6a815..820e18290f 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -46,8 +46,6 @@ #include "llenvironment.h" #include "llatmosphere.h" -#pragma optimize("", off) - #ifdef LL_RELEASE_FOR_DOWNLOAD #define UNIFORM_ERRS LL_WARNS_ONCE("Shader") #else diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index a2ea3181ca..fc83218b1a 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -53,8 +53,6 @@ #include "llsettingssky.h" #include "llenvironment.h" -#pragma optimize("", off) - #undef min #undef max 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 |