From 93736308c90ebf016930486fe3b530a881e6ab33 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Mon, 30 Dec 2013 19:38:41 +0100 Subject: [PATCH 1/2] Add missing ft2build.h to linux64 freetype package. --- install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.xml b/install.xml index b4e452428..f55565238 100644 --- a/install.xml +++ b/install.xml @@ -526,9 +526,9 @@ linux64 md5sum - 9513c22a343369043536514bc87e5801 + 63f940c765875ee0b2fc2ed68019a602 url - https://bitbucket.org/SingularityViewer/libraries/downloads/freetype-2.3.11-linux-x86_64-20120616.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/freetype-2.3.11-linux-x86_64-20131230.tar.bz2 windows From 9bce3b38d4889d166a00614e7285b08b52eafe97 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 31 Dec 2013 23:37:10 +0100 Subject: [PATCH 2/2] Do not erase cache every login forever, when NewCacheLocation is set a non-existing directory! I can't believe that I have not have gotten a cache for two years because of this... I knew I didn't, but didn't really want to fix it while I working on the network code (AICurl) ;). It kinda made for a good testing. Bet my ISP is glad I fixed it though. --- indra/newview/llappviewer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5d9da37c8..32501de62 100644 --- 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)