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

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)

install.xml

@@ -526,9 +526,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>9513c22a343369043536514bc87e5801</string>
+            <string>63f940c765875ee0b2fc2ed68019a602</string>
             <key>url</key>
-            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/freetype-2.3.11-linux-x86_64-20120616.tar.bz2</uri>
+            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/freetype-2.3.11-linux-x86_64-20131230.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>