From 22b861982f2efd5d16097a012627e73b9fb85834 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 9 Dec 2008 22:25:37 -0600
Subject: Second Life viewer sources 1.22.2-RC

---
 linden/indra/newview/llurlhistory.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llurlhistory.cpp')

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)
 
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
-{
-	std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
-	llofstream out((temp_str + filename));
+{	
+	std::string temp_str = gDirUtilp->getLindenUserDir();
+	if( temp_str.empty() )
+	{
+		llwarns << "Can't save. No user directory set." << llendl;
+		return false;
+	}
+
+	temp_str += gDirUtilp->getDirDelimiter() + filename;
+	llofstream out(temp_str);
 	if (!out.good())
 	{
 		llwarns << "Unable to open " << filename << " for output." << llendl;
-- 
cgit v1.1


From a87e38229921b48c32187c672a942516722f1b52 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 11 Jan 2009 16:10:39 -0600
Subject: Second Life viewer sources 1.22.5-RC

---
 linden/indra/newview/llurlhistory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/llurlhistory.cpp')

diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index 0dadbd0..e96a6b2 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
-- 
cgit v1.1