diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-04-10 11:02:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-04-10 11:02:37 -0400 |
| commit | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (patch) | |
| tree | 15933c1910c4b337e0c181434b6d653628f62eed /indra/newview/llviewernetwork.cpp | |
| parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) | |
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
Diffstat (limited to 'indra/newview/llviewernetwork.cpp')
| -rwxr-xr-x | indra/newview/llviewernetwork.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp index 0a283efae2..faa58d423f 100755 --- a/indra/newview/llviewernetwork.cpp +++ b/indra/newview/llviewernetwork.cpp @@ -135,7 +135,7 @@ void LLGridManager::initialize(const std::string& grid_file) "Aditi"); LLSD other_grids; - std::ifstream llsd_xml; + llifstream llsd_xml; if (!grid_file.empty()) { LL_INFOS("GridManager")<<"Grid configuration file '"<<grid_file<<"'"<<LL_ENDL; |