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/llpanellogin.cpp | |
| parent | 47a3aecc97faa6ecb5267dde4274f0fe417e8409 (diff) | |
| parent | 6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff) | |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 89c898001f..8b9cd9c88a 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -307,11 +307,11 @@ void LLPanelLogin::addFavoritesToStartLocation() updateLoginButtons(); LLSD fav_llsd; - llifstream file; - file.open(filename); + std::ifstream file; + file.open(filename.c_str()); if (!file.is_open()) { - file.open(old_filename); + file.open(old_filename.c_str()); if (!file.is_open()) return; } LLSDSerialize::fromXML(fav_llsd, file); |