summaryrefslogtreecommitdiff
path: root/indra/newview/lllocationhistory.cpp
diff options
context:
space:
mode:
authornat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
committernat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
commit75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch)
tree33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/newview/lllocationhistory.cpp
parente59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/newview/lllocationhistory.cpp')
-rwxr-xr-xindra/newview/lllocationhistory.cpp4
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())
{