diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-04-14 13:46:01 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-04-14 13:46:01 -0700 |
| commit | d631f2fd4daed5e3b10fc6dc290aa16f3d0591f0 (patch) | |
| tree | afc5139a2d530bdca9233308d2b6d6d4532bc6c4 /indra/newview/llviewernetwork.cpp | |
| parent | 5411f349e5ed8835d5c99dbfb19a0934a6e5e28f (diff) | |
| parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) | |
Pull merge from lindenlab/viewer-tools-update (includes viewer-release)
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; |