From 95ecfad58275879ebf8d803f89f17cf34790c1cc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 1 Jul 2011 02:44:44 -0700
Subject: Fixed #742: cache reset to default button doesn't work (introduced in
 7507619e)

---
 linden/indra/newview/llappviewer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2fab25b..1b32581 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2991,7 +2991,7 @@ bool LLAppViewer::initCache()
 		cache_location = gSavedSettings.getString("CacheLocation");
 	}
 	std::string new_cache_location = gSavedSettings.getString("NewCacheLocation");
-	if ((new_cache_location != cache_location) && new_cache_location != "")
+	if (new_cache_location != cache_location)
 	{
 		gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
 		purgeCache(); // purge old cache
@@ -2999,7 +2999,7 @@ bool LLAppViewer::initCache()
 		cache_location = new_cache_location;
 	}
 	
-	if (!gDirUtilp->setCacheDir(cache_location))
+	if (!gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")))
 	{
 		LL_WARNS("AppCache") << "Unable to set cache location" << LL_ENDL;
 		gSavedSettings.setString("CacheLocation", "");
-- 
cgit v1.1