2 files changed, 20 insertions, 5 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7d9a0ca..3d38a18 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2574,6 +2574,17 @@
   
   <!-- Begin: cache clearing -->
 
+  <key>KeepUnpackedCacheFiles</key>
+  <map>
+    <key>Comment</key>
+    <string>If TRUE, the viewer won't delete unpacked cache files when logging out (improves overall performance and fixes sound bugs)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>PurgeCacheOnStartup</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 62b6242..c10c79b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1298,13 +1298,17 @@ bool LLAppViewer::cleanup()
         llinfos << "Settings patched up" << llendflush;
 
         // delete some of the files left around in the cache.
-        removeCacheFiles("*.wav");
+        if (!gSavedSettings.getBOOL("KeepUnpackedCacheFiles"))
+        {
+                LL_INFOS("AppCache") << "Purging unpacked files..." << llendl;
+                removeCacheFiles("*.wav");
+                removeCacheFiles("*.lso");
+                removeCacheFiles("*.dsf");
+                removeCacheFiles("*.bodypart");
+                removeCacheFiles("*.clothing");
+        }
         removeCacheFiles("*.tmp");
-        removeCacheFiles("*.lso");
         removeCacheFiles("*.out");
-        removeCacheFiles("*.dsf");
-        removeCacheFiles("*.bodypart");
-        removeCacheFiles("*.clothing");
 
         llinfos << "Cache files removed" << llendflush;