5 files changed, 53 insertions, 27 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index cd708fd..e5e3eb0 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -85,6 +85,8 @@ Aleric Inglewood
         IMP-662
         IMP-663
         IMP-664
+        IMP-667
+        IMP-670
 Alissa Sabre
         VWR-81
         VWR-83
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7fe1040..35f4e3a 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -8,6 +8,14 @@ if (NOT STANDALONE)
      use_prebuilt_binary(32bitcompatibilitylibs)
    endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   use_prebuilt_binary(fontconfig)
+else (NOT STANDALONE)
+  # Download there even when using standalone.
+  set(STANDALONE OFF)
+  use_prebuilt_binary(vivox)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(32bitcompatibilitylibs)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
+  set(STANDALONE ON)
 endif(NOT STANDALONE)
 
 if (WINDOWS)
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index a9b7f81..a1a9a39 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1172,7 +1172,7 @@ void LLTextureCache::readHeaderCache()
                         U32 empty_entries = 0;
                         typedef std::pair<U32, LLUUID> lru_data_t;
                         std::set<lru_data_t> lru;
-                        std::vector<LLUUID> purge_list;
+                        std::set<LLUUID> purge_list;
                         for (U32 i=0; i<num_entries; i++)
                         {
                                 Entry& entry = entries[i];
@@ -1191,27 +1191,23 @@ void LLTextureCache::readHeaderCache()
                                                 {
                                                         // Shouldn't happen, failsafe only
                                                         llwarns << "Bad entry: " << i << ": " << entry.mID << ": BodySize: " << entry.mBodySize << llendl;
-                                                        purge_list.push_back(id);
+                                                        purge_list.insert(id);
                                                 }
                                         }
                                 }
                         }
-                        if (num_entries > sCacheMaxEntries)
+                        if (num_entries - empty_entries > sCacheMaxEntries)
                         {
                                 // Special case: cache size was reduced, need to remove entries
                                 // Note: After we prune entries, we will call this again and create the LRU
-                                U32 entries_to_purge = (num_entries-empty_entries) - sCacheMaxEntries;
+                                U32 entries_to_purge = (num_entries - empty_entries) - sCacheMaxEntries;
                                 llinfos << "Texture Cache Entries: " << num_entries << " Max: " << sCacheMaxEntries << " Empty: " << empty_entries << " Purging: " << entries_to_purge << llendl;
-                                if (entries_to_purge > 0)
+                                // We can exit the following loop with the given condition, since if we'd reach the end of the lru set we'd have:
+                                // purge_list.size() = lru.size() = num_entries - empty_entries = entries_to_purge + sCacheMaxEntries >= entries_to_purge
+                                for (std::set<lru_data_t>::iterator iter = lru.begin(); purge_list.size() < entries_to_purge; ++iter)
                                 {
-                                        for (std::set<lru_data_t>::iterator iter = lru.begin(); iter != lru.end(); ++iter)
-                                        {
-                                                purge_list.push_back(iter->second);
-                                                if (purge_list.size() >= entries_to_purge)
-                                                        break;
-                                        }
+                                        purge_list.insert(iter->second);
                                 }
-                                llassert_always(purge_list.size() >= entries_to_purge);
                         }
                         else
                         {
@@ -1227,11 +1223,9 @@ void LLTextureCache::readHeaderCache()
                         
                         if (purge_list.size() > 0)
                         {
-                                for (std::vector<LLUUID>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
+                                for (std::set<LLUUID>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
                                 {
-                                        mHeaderMutex.unlock(); 
-                                        removeFromCache(*iter);
-                                        mHeaderMutex.lock();
+                                        removeFromCacheLocked(*iter);
                                 }
                                 // If we removed any entries, we need to rebuild the entries list,
                                 // write the header, and call this again
@@ -1250,7 +1244,7 @@ void LLTextureCache::readHeaderCache()
                                 writeEntriesAndClose(new_entries);
                                 mHeaderMutex.unlock(); // unlock the mutex before calling again
                                 readHeaderCache(); // repeat with new entries file
-                                mHeaderMutex.lock();
+                                return;
                         }
                         else
                         {
@@ -1345,7 +1339,7 @@ void LLTextureCache::purgeTextures(bool validate)
         if (validate)
         {
                 validate_idx = gSavedSettings.getU32("CacheValidateCounter");
-                U32 next_idx = (++validate_idx) % 256;
+                U32 next_idx = (validate_idx + 1) % 256;
                 gSavedSettings.setU32("CacheValidateCounter", next_idx);
                 LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL;
         }
@@ -1388,7 +1382,15 @@ void LLTextureCache::purgeTextures(bool validate)
                 {
                         purge_count++;
                         LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
-                        LLAPRFile::remove(filename);
+                        if (entries[idx].mBodySize > 0)
+                        {
+                                LLAPRFile::remove(filename);
+                        }
+                        else if (LLAPRFile::isExist(filename))  // Sanity check. Shouldn't exist.
+                        {
+                                LL_WARNS("TextureCache") << "Entry has zero body size but existing " << filename << ". Deleting file too..." << LL_ENDL;
+                                LLAPRFile::remove(filename);
+                        }
                         cache_size -= entries[idx].mBodySize;
                         mTexturesSizeTotal -= entries[idx].mBodySize;
                         entries[idx].mBodySize = 0;
@@ -1615,7 +1617,6 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
 {
         if (!mReadOnly)
         {
-                LLMutexLock lock(&mHeaderMutex);
                 Entry entry;
                 S32 idx = openAndReadEntry(id, entry, false);
                 if (idx >= 0)
@@ -1632,17 +1633,26 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
         return false;
 }
 
-void LLTextureCache::removeFromCache(const LLUUID& id)
+void LLTextureCache::removeFromCacheLocked(const LLUUID& id)
 {
         //llwarns << "Removing texture from cache: " << id << llendl;
         if (!mReadOnly)
         {
                 removeHeaderCacheEntry(id);
-                LLMutexLock lock(&mHeaderMutex);
                 LLAPRFile::remove(getTextureFileName(id));
         }
 }
 
+void LLTextureCache::removeFromCache(const LLUUID& id)
+{
+        //llwarns << "Removing texture from cache: " << id << llendl;
+        if (!mReadOnly)
+        {
+                LLMutexLock lock(&mHeaderMutex);
+                LLTextureCache::removeFromCacheLocked(id);
+        }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 LLTextureCache::ReadResponder::ReadResponder()
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 45804c2..c859b9a 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -158,6 +158,7 @@ private:
         S32 getHeaderCacheEntry(const LLUUID& id, S32& imagesize);
         S32 setHeaderCacheEntry(const LLUUID& id, S32 imagesize);
         bool removeHeaderCacheEntry(const LLUUID& id);
+        void removeFromCacheLocked(const LLUUID& id);
         
 private:
         // Internal
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index a16034f..f09fc48 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -534,24 +534,24 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
                                                          platform, 
                                                          cache_dir))
         to_install = []
+        to_uninstall = []
         #print "self._installed",self._installed
         for ifile in ifiles:
             if ifile.pkgname not in self._installed:
                 to_install.append(ifile)
             elif ifile.url not in self._installed[ifile.pkgname].urls():
+                to_uninstall.append(ifile.pkgname)
                 to_install.append(ifile)
             elif ifile.md5sum != \
                  self._installed[ifile.pkgname].get_md5sum(ifile.url):
-                # *TODO: We may want to uninstall the old version too
-                # when we detect it is installed, but the md5 sum is
-                # different.
+                to_uninstall.append(ifile.pkgname)
                 to_install.append(ifile)
             else:
                 #print "Installation up to date:",
                 #        ifile.pkgname,ifile.platform_path
                 pass
         #print "to_install",to_install
-        return to_install
+        return [to_install, to_uninstall]
 
     def _install(self, to_install, install_dir):
         for ifile in to_install:
@@ -620,12 +620,17 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
         cache_dir = os.path.realpath(cache_dir)
         _mkdir(install_dir)
         _mkdir(cache_dir)
-        to_install = self._build_ifiles(platform, cache_dir)
+        to_install_uninstall = self._build_ifiles(platform, cache_dir)
+        to_install = to_install_uninstall[0]
+        to_uninstall = to_install_uninstall[1]
 
         # Filter for files which we actually requested to install.
         to_install = [ifl for ifl in to_install if ifl.pkgname in installables]
+        to_uninstall = [ifl for ifl in to_uninstall if ifl in installables]
         for ifile in to_install:
             ifile.fetch_local()
+        if to_uninstall:
+            self.uninstall(to_uninstall, install_dir)
         self._install(to_install, install_dir)
 
     def do_install(self, installables, platform, install_dir, cache_dir=None,