diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-02 12:27:34 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-02 12:27:34 -0700 |
| commit | d78ed764b538cf0fa0eba3e39fbbf99ef059660a (patch) | |
| tree | 5f19fcdd4826e15c39ca70f3f6b3a7aee22e4a69 /indra/newview/llviewernetwork.cpp | |
| parent | 14629ca3d661c8ec798ad072c4e739571d9c1196 (diff) | |
| parent | 5cf18cb867be567bf921f0b94a78fd822e4112ad (diff) | |
Merge 6.1.2 LoveMeRender new hotness
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rw-r--r-- | indra/newview/llviewernetwork.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 374322ac10..a593905060 100644 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -34,6 +34,7 @@ #include "lltrans.h" #include "llweb.h" + /// 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 @@ -87,13 +88,6 @@ LLGridManager::LLGridManager() // an attacker. Don't want someone snagging a password. std::string grid_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids.xml"); - - // fall back to app_settings/grids.xml if it's provided - if (!LLFile::isfile(grid_file)) - { - grid_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, - "grids.xml"); - } LL_DEBUGS("GridManager")<<LL_ENDL; initialize(grid_file); @@ -139,13 +133,6 @@ void LLGridManager::initialize(const std::string& grid_file) "https://my.aditi.lindenlab.com/", "Aditi"); - // 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; if (!grid_file.empty()) |