diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-18 23:16:56 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-18 23:16:56 +0100 |
| commit | 190fa8614c5630f7f360ce028ed08879af308511 (patch) | |
| tree | 1f2bda7bd387f7b820ce808f594de365835f7141 /indra/newview | |
| parent | 8082cb86682c008389cb8127f295e6566ec368e5 (diff) | |
Remove MSVC debug pragmas and comment out code to dump example grids.xml file w/ hard-coded grids.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvosky.cpp | 2 |
3 files changed, 6 insertions, 11 deletions
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 |