Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

2014-01-16 08:18:04 +01:00
parent b7c54301fb 9bce3b38d4
commit bbb1d15b8e
2 changed files with 4 additions and 2 deletions
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3285,6 +3285,8 @@ bool LLAppViewer::initCache()
 	{
 		LL_WARNS("AppCache") << "Unable to set cache location" << LL_ENDL;
 		gSavedSettings.setString("CacheLocation", "");
+		// Keep NewCacheLocation equal to CacheLocation so we won't try to erase the cache the next time the viewer is run.
+		gSavedSettings.setString("NewCacheLocation", "");
 	}
 	
 	if (mPurgeCache && !read_only)