aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llurlhistory.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llurlhistory.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llurlhistory.cpp')
-rw-r--r--linden/indra/newview/llurlhistory.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index da69df6..ac3fa93 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -43,13 +43,13 @@ const int MAX_URL_COUNT = 10;
43///////////////////////////////////////////////////////////////////////////// 43/////////////////////////////////////////////////////////////////////////////
44 44
45// static 45// static
46bool LLURLHistory::loadFile(const LLString& filename) 46bool LLURLHistory::loadFile(const std::string& filename)
47{ 47{
48 LLSD data; 48 LLSD data;
49 { 49 {
50 LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); 50 std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
51 51
52 llifstream file((temp_str + filename).c_str()); 52 llifstream file((temp_str + filename));
53 53
54 if (file.is_open()) 54 if (file.is_open())
55 { 55 {
@@ -71,10 +71,10 @@ bool LLURLHistory::loadFile(const LLString& filename)
71} 71}
72 72
73// static 73// static
74bool LLURLHistory::saveFile(const LLString& filename) 74bool LLURLHistory::saveFile(const std::string& filename)
75{ 75{
76 LLString temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); 76 std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
77 llofstream out((temp_str + filename).c_str()); 77 llofstream out((temp_str + filename));
78 if (!out.good()) 78 if (!out.good())
79 { 79 {
80 llwarns << "Unable to open " << filename << " for output." << llendl; 80 llwarns << "Unable to open " << filename << " for output." << llendl;