From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 26 Jun 2008 00:39:00 +0000 Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release dataserver-is-deprecated --- indra/newview/llurlhistory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/llurlhistory.cpp') diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp index d5241a4e98..902ab88688 100644 --- a/indra/newview/llurlhistory.cpp +++ b/indra/newview/llurlhistory.cpp @@ -43,13 +43,13 @@ const int MAX_URL_COUNT = 10; ///////////////////////////////////////////////////////////////////////////// // static -bool LLURLHistory::loadFile(const LLString& filename) +bool LLURLHistory::loadFile(const std::string& filename) { LLSD data; { - LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); + std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); - llifstream file((temp_str + filename).c_str()); + llifstream file((temp_str + filename)); if (file.is_open()) { @@ -71,10 +71,10 @@ bool LLURLHistory::loadFile(const LLString& filename) } // static -bool LLURLHistory::saveFile(const LLString& filename) +bool LLURLHistory::saveFile(const std::string& filename) { - LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); - llofstream out((temp_str + filename).c_str()); + std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); + llofstream out((temp_str + filename)); if (!out.good()) { llwarns << "Unable to open " << filename << " for output." << llendl; -- cgit v1.2.3