diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-04-09 16:51:02 -0700 |
| commit | 8952e8177528fe0eee65916b9e12c3183f15e392 (patch) | |
| tree | 3625cecb6fd90bf0de23021c22b5d805527af131 /indra/newview/llviewernetwork.cpp | |
| parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
| parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) | |
Merge lindenlab/viewer-tools-update
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 faa58d423f..0a283efae2 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; - llifstream llsd_xml; + std::ifstream llsd_xml; if (!grid_file.empty()) { LL_INFOS("GridManager")<<"Grid configuration file '"<<grid_file<<"'"<<LL_ENDL; |