2 files changed, 10 insertions, 1 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index cd708fd..2b40104 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -85,6 +85,7 @@ Aleric Inglewood
         IMP-662
         IMP-663
         IMP-664
+        IMP-667
 Alissa Sabre
         VWR-81
         VWR-83
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 56f3719..a1a9a39 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1382,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;