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/llvosky.cpp | |
| parent | 37e8fd20c3823482f3a15b4bfd544f7847070db8 (diff) | |
Fix mis-merge of LLSettingsBase and remove optimize pragmas.
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
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 |