Remove MSVC debug pragmas and comment out code to dump example grids.xml file w/ hard-coded grids.

7 files changed, 6 insertions, 19 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index c5dfd765f2..25d197d9be 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 95e1274c16..9bdbc9c80a 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -33,8 +33,6 @@
 #include "llrender.h"
 #include "llvertexbuffer.h"
 
-#pragma optimize("", off)
-
 #if LL_DARWIN
 #include "OpenGL/OpenGL.h"
 #endif
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 3857dc0519..562cbdcba9 100644
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -31,8 +31,6 @@
 #include "llrender.h"
 #include "llstaticstringtable.h"
 
-#pragma optimize("", off)
-
 class LLShaderFeatures
 {
 public:
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index f1ddbed956..4d0e0f2249 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -31,8 +31,6 @@
 #include "llfile.h"
 #include "llrender.h"
 
-#pragma optimize("", off)
-
 #if LL_DARWIN
 #include "OpenGL/OpenGL.h"
 #endif
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index cc1738cf4b..85924a779a 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -34,8 +34,6 @@
 #include "lltrans.h"
 #include "llweb.h"
 
-#pragma optimize("", off)
-
 /// key used to store the grid, and the name attribute in the grid data
 const std::string  GRID_VALUE = "keyname";
 /// the value displayed in the grid selector menu, and other human-oriented text
@@ -141,11 +139,12 @@ void LLGridManager::initialize(const std::string& grid_file)
 				  "https://my.aditi.lindenlab.com/",
 				  "Aditi");
 
-    llofstream out_llsd_xml;
-    std::string default_grid_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml");
-    out_llsd_xml.open(default_grid_file.c_str());
-    LLSDSerialize::toPrettyXML(mGridList, out_llsd_xml);
-    out_llsd_xml.close();
+    // dump example grid file...
+    //llofstream out_llsd_xml;
+    //std::string default_grid_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml");
+    //out_llsd_xml.open(default_grid_file.c_str());
+    //LLSDSerialize::toPrettyXML(mGridList, out_llsd_xml);
+    //out_llsd_xml.close();
 
 	LLSD other_grids;
 	llifstream llsd_xml;
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 40cf4c82e6..5aa29f920e 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 1e99c77da9..57f8b7339d 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