From 676beaab8d6f6717d15f4e6d30e08a428ba7c408 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 5 Jul 2011 20:07:38 -0700
Subject: Added clear sounds cache option

---
 linden/indra/newview/app_settings/settings.xml                | 11 +++++++++++
 linden/indra/newview/floatercache.cpp                         |  5 ++++-
 linden/indra/newview/llappviewer.cpp                          |  7 +++++++
 .../newview/skins/default/xui/en-us/floater_clear_cache.xml   |  7 +++++--
 4 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 3d38a18..74750a6 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2640,6 +2640,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ClearSoundsCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear cached sounds</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   
   <!-- End: clear cache -->
 
diff --git a/linden/indra/newview/floatercache.cpp b/linden/indra/newview/floatercache.cpp
index 3d3091f..211fd5a 100644
--- a/linden/indra/newview/floatercache.cpp
+++ b/linden/indra/newview/floatercache.cpp
@@ -53,6 +53,7 @@ BOOL FloaterCache::postBuild()
 	getChild<LLCheckBoxCtrl>("object_cache")->setValue(gSavedSettings.getBOOL("ClearObjectCache"));
 	getChild<LLCheckBoxCtrl>("inv_cache")->setValue(gSavedSettings.getBOOL("ClearInvCache"));
 	getChild<LLCheckBoxCtrl>("name_cache")->setValue(gSavedSettings.getBOOL("ClearNameCache"));
+	getChild<LLCheckBoxCtrl>("sounds_cache")->setValue(gSavedSettings.getBOOL("ClearSoundsCache"));
 
 	childSetAction("btn_ok", onClickOK, this);
 	childSetAction("btn_cancel", onClickCancel, this);
@@ -70,13 +71,15 @@ void FloaterCache::onClickOK(void* data)
 		bool purge_objects = self->getChild<LLCheckBoxCtrl>("object_cache")->getValue().asBoolean();
 		bool purge_inv = self->getChild<LLCheckBoxCtrl>("inv_cache")->getValue().asBoolean();
 		bool purge_names = self->getChild<LLCheckBoxCtrl>("name_cache")->getValue().asBoolean();
+		bool purge_sounds = self->getChild<LLCheckBoxCtrl>("sounds_cache")->getValue().asBoolean();
 		
 		gSavedSettings.setBOOL("ClearTextureCache", purge_textures);
 		gSavedSettings.setBOOL("ClearObjectCache", purge_objects);
 		gSavedSettings.setBOOL("ClearInvCache", purge_inv);
 		gSavedSettings.setBOOL("ClearNameCache", purge_names);
+		gSavedSettings.setBOOL("ClearSoundsCache", purge_sounds);
 			
-		if (purge_textures || purge_objects || purge_inv || purge_names)
+		if (purge_textures || purge_objects || purge_inv || purge_names || purge_sounds)
 		{
 			// flag client cache for clearing next time the client runs
 			gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c10c79b..5a398a5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -3238,6 +3238,13 @@ void LLAppViewer::purgeCache()
 
 			gSavedSettings.setBOOL("ClearNameCache", FALSE);
 		}
+
+		if (gSavedSettings.getBOOL("ClearSoundsCache"))
+		{
+			removeCacheFiles("*.wav");
+			removeCacheFiles("*.dsf");
+			gSavedSettings.setBOOL("ClearSoundsCache", FALSE);
+		}
 	}
 }
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
index e965b28..7974d85 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-175" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" mouse_opaque="true" height="175" width="200"
+<floater bottom="-200" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" mouse_opaque="true" height="200" width="200"
      name="Clear Cache" title="Clear Disk Cache">
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
      bottom="-39" drop_shadow_visible="true" follows="left|top" font-style="BOLD|SHADOW"
@@ -19,6 +19,9 @@ You Restart Imprudence
      initial_value="false" label="Clear inventory cache" left_delta="0"
      mouse_opaque="true" name="inv_cache" width="185" />
   <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear sound cache" left_delta="0"
+     mouse_opaque="true" name="sounds_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
      initial_value="false" label="Clear avatar name cache" left_delta="0"
      mouse_opaque="true" name="name_cache" width="185" />
   <button bottom_delta="-30" follows="right|top" font="SansSerif" halign="center" height="22"
-- 
cgit v1.1