summaryrefslogtreecommitdiff
path: root/indra/newview/llviewernetwork.cpp
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-05-18 23:16:56 +0100
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-05-18 23:16:56 +0100
commit190fa8614c5630f7f360ce028ed08879af308511 (patch)
tree1f2bda7bd387f7b820ce808f594de365835f7141 /indra/newview/llviewernetwork.cpp
parent8082cb86682c008389cb8127f295e6566ec368e5 (diff)
Remove MSVC debug pragmas and comment out code to dump example grids.xml file w/ hard-coded grids.
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
-rw-r--r--indra/newview/llviewernetwork.cpp13
1 files changed, 6 insertions, 7 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;