diff options
| author | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-12 10:32:02 -0800 |
| commit | 5866bb7ef09b786f8f195770a70dc4289d183ca0 (patch) | |
| tree | 0be3b5e63506bf30edd3748f9e31740ae9ebbaa8 /indra/newview/llurlhistory.cpp | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
| parent | a8192fbf60540e42dcff5f1efb8bf8cafbfac484 (diff) | |
merge with release
Diffstat (limited to 'indra/newview/llurlhistory.cpp')
| -rwxr-xr-x | indra/newview/llurlhistory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp index a80b9da13c..8eea2b242a 100755 --- a/indra/newview/llurlhistory.cpp +++ b/indra/newview/llurlhistory.cpp @@ -48,15 +48,15 @@ bool LLURLHistory::loadFile(const std::string& filename) if (file.is_open()) { - llinfos << "Loading history.xml file at " << filename << llendl; + LL_INFOS() << "Loading history.xml file at " << filename << LL_ENDL; LLSDSerialize::fromXML(data, file); } if (data.isUndefined()) { - llinfos << "file missing, ill-formed, " + LL_INFOS() << "file missing, ill-formed, " "or simply undefined; not changing the" - " file" << llendl; + " file" << LL_ENDL; sHistorySD = LLSD(); return false; } @@ -71,7 +71,7 @@ bool LLURLHistory::saveFile(const std::string& filename) std::string temp_str = gDirUtilp->getLindenUserDir(); if( temp_str.empty() ) { - llinfos << "Can't save URL history - no user directory set yet." << llendl; + LL_INFOS() << "Can't save URL history - no user directory set yet." << LL_ENDL; return false; } @@ -79,7 +79,7 @@ bool LLURLHistory::saveFile(const std::string& filename) llofstream out(temp_str); if (!out.good()) { - llwarns << "Unable to open " << filename << " for output." << llendl; + LL_WARNS() << "Unable to open " << filename << " for output." << LL_ENDL; return false; } |