From 5517eb3f6f06226fba0ffe510334f519a8a7d7b7 Mon Sep 17 00:00:00 2001
From: "Graham Linden graham@lindenlab.com"
 <Graham Linden graham@lindenlab.com>
Date: Sat, 3 Mar 2018 01:08:58 +0000
Subject: Remove MSVC pragmas breaking OSX build.

---
 indra/llinventory/llsettingssky.cpp | 2 --
 indra/llrender/llglslshader.cpp     | 4 ----
 indra/newview/llviewershadermgr.cpp | 5 -----
 3 files changed, 11 deletions(-)

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 91357a6e49..5d38deb229 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -32,8 +32,6 @@
 #include "llfasttimer.h"
 #include "v3colorutil.h"
 
-#pragma optimize("", off)
-
 //=========================================================================
 namespace
 {
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index a5939a6eb9..b09ec53bc0 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -374,8 +374,6 @@ void LLGLSLShader::unloadInternal()
     stop_glerror();
 }
 
-#pragma optimize("", off)
-
 BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
                                 std::vector<LLStaticHashedString> * uniforms,
                                 U32 varying_count,
@@ -492,8 +490,6 @@ BOOL LLGLSLShader::createShader(std::vector<LLStaticHashedString> * attributes,
     return success;
 }
 
-#pragma optimize("", on)
-
 BOOL LLGLSLShader::attachObject(std::string object)
 {
     if (LLShaderMgr::instance()->mShaderObjects.count(object) > 0)
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index c4fa4e86b4..1c78bf36db 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -3288,8 +3288,6 @@ BOOL LLViewerShaderMgr::loadShadersInterface()
 	return TRUE;
 }
 
-#pragma optimize("", off)
-
 BOOL LLViewerShaderMgr::loadShadersWindLight()
 {
 	BOOL success = TRUE;
@@ -3360,9 +3358,6 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
 	return success;
 }
 
-#pragma optimize("", on)
-
-
 BOOL LLViewerShaderMgr::loadTransformShaders()
 {
 	BOOL success = TRUE;
-- 
cgit v1.2.3