diff options
| author | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-13 09:37:09 -0700 |
| commit | fe8dec32dbdd6085dd582c49134551638561ca0e (patch) | |
| tree | 8adf11b88185879911fca64825e73b95ff9db972 /indra/newview/lllocationhistory.cpp | |
| parent | 2d3e4576d7a1f6d5f2a9c0596cefe3f62753b2fa (diff) | |
| parent | 5c6cf3e7fb9f592e3a293921175b64b515bac23f (diff) | |
Merge
Diffstat (limited to 'indra/newview/lllocationhistory.cpp')
| -rwxr-xr-x | indra/newview/lllocationhistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 680b35b550..162d6e003e 100755 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -127,7 +127,7 @@ void LLLocationHistory::save() const } // open a file for writing - llofstream file (resolved_filename); + llofstream file(resolved_filename.c_str()); if (!file.is_open()) { LL_WARNS() << "can't open location history file \"" << mFilename << "\" for writing" << LL_ENDL; @@ -148,7 +148,7 @@ void LLLocationHistory::load() // build filename for each user std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename); - llifstream file(resolved_filename); + llifstream file(resolved_filename.c_str()); if (!file.is_open()) { |