aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2008-12-05 05:00:17 -0700
committerJacek Antonelli2008-12-10 21:31:13 -0600
commit237b2c2d7e9c4844d4ca7c8f97b3a8b53eb9dec4 (patch)
tree47c1a42d5570b9ac43c1127a257b6eb15ef9bcb6 /linden/indra/newview
parentRebranded login menu. [#23] (diff)
downloadmeta-impy-237b2c2d7e9c4844d4ca7c8f97b3a8b53eb9dec4.zip
meta-impy-237b2c2d7e9c4844d4ca7c8f97b3a8b53eb9dec4.tar.gz
meta-impy-237b2c2d7e9c4844d4ca7c8f97b3a8b53eb9dec4.tar.bz2
meta-impy-237b2c2d7e9c4844d4ca7c8f97b3a8b53eb9dec4.tar.xz
Fixed blank url_history.xml creation. (VWR-5808)
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llurlhistory.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index ac3fa93..0dadbd0 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -72,9 +72,16 @@ bool LLURLHistory::loadFile(const std::string& filename)
72 72
73// static 73// static
74bool LLURLHistory::saveFile(const std::string& filename) 74bool LLURLHistory::saveFile(const std::string& filename)
75{ 75{
76 std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); 76 std::string temp_str = gDirUtilp->getLindenUserDir();
77 llofstream out((temp_str + filename)); 77 if( temp_str.empty() )
78 {
79 llwarns << "Can't save. No user directory set." << llendl;
80 return false;
81 }
82
83 temp_str += gDirUtilp->getDirDelimiter() + filename;
84 llofstream out(temp_str);
78 if (!out.good()) 85 if (!out.good())
79 { 86 {
80 llwarns << "Unable to open " << filename << " for output." << llendl; 87 llwarns << "Unable to open " << filename << " for output." << llendl;