9 files changed, 299 insertions, 28 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 46da492..1b9f75a 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
     floaterao.cpp
     floaterbusy.cpp
     floatercommandline.cpp
+    floatercache.cpp
     floaterdice.cpp
     floatergriddefault.cpp
     floatergridmanager.cpp
@@ -536,6 +537,7 @@ set(viewer_HEADER_FILES
     floaterao.h
     floaterbusy.h
     floatercommandline.h
+    floatercache.h
     floaterdice.h
     floatergriddefault.h
     floatergridmanager.h
diff --git a/linden/indra/newview/app_settings/cmd_line.xml b/linden/indra/newview/app_settings/cmd_line.xml
index f5c6cdb..9fd4669 100644
--- a/linden/indra/newview/app_settings/cmd_line.xml
+++ b/linden/indra/newview/app_settings/cmd_line.xml
@@ -157,7 +157,7 @@
       <key>desc</key>
       <string>Delete files in the cache.</string>
       <key>map-to</key>
-      <string>PurgeCacheOnNextStartup</string>
+      <string>PurgeCacheOnStartup</string>
     </map>
 
     <key>noinvlib</key>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index eb59254..7d9a0ca 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2571,6 +2571,66 @@
   </map>
 
   <!-- End: full radar (Advanced menu) -->
+  
+  <!-- Begin: cache clearing -->
+
+  <key>PurgeCacheOnStartup</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear local file cache every time viewer is run (cmd line --purge)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearTextureCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear texture cache</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearObjectCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear object cache</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearInvCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear inventory cache</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>ClearNameCache</key>
+  <map>
+    <key>Comment</key>
+    <string>Clear cached avatar names/uuids</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  
+  <!-- End: clear cache -->
 
   <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
 
@@ -9334,17 +9394,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>PurgeCacheOnStartup</key>
-    <map>
-      <key>Comment</key>
-      <string>Clear local file cache every time viewer is run</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>PushToTalkButton</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/floatercache.cpp b/linden/indra/newview/floatercache.cpp
new file mode 100644
index 0000000..3d3091f
--- /dev/null
+++ b/linden/indra/newview/floatercache.cpp
@@ -0,0 +1,97 @@
+/**
+* @file floatercache.cpp
+* @brief clear cache window for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "floatercache.h"
+
+#include "llcheckboxctrl.h"
+#include "lluictrlfactory.h"
+
+#include "llviewercontrol.h"
+
+
+FloaterCache::FloaterCache(const LLSD& seed) : LLFloater("Clear Cache")
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_clear_cache.xml");
+}
+
+FloaterCache::~FloaterCache()
+{
+}
+
+BOOL FloaterCache::postBuild()
+{
+        getChild<LLCheckBoxCtrl>("texture_cache")->setValue(gSavedSettings.getBOOL("ClearTextureCache"));
+        getChild<LLCheckBoxCtrl>("object_cache")->setValue(gSavedSettings.getBOOL("ClearObjectCache"));
+        getChild<LLCheckBoxCtrl>("inv_cache")->setValue(gSavedSettings.getBOOL("ClearInvCache"));
+        getChild<LLCheckBoxCtrl>("name_cache")->setValue(gSavedSettings.getBOOL("ClearNameCache"));
+
+        childSetAction("btn_ok", onClickOK, this);
+        childSetAction("btn_cancel", onClickCancel, this);
+
+        return TRUE;
+}
+
+// static
+void FloaterCache::onClickOK(void* data)
+{
+        FloaterCache* self = (FloaterCache*)data;
+        if (self)
+        {
+                bool purge_textures = self->getChild<LLCheckBoxCtrl>("texture_cache")->getValue().asBoolean();
+                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();
+                
+                gSavedSettings.setBOOL("ClearTextureCache", purge_textures);
+                gSavedSettings.setBOOL("ClearObjectCache", purge_objects);
+                gSavedSettings.setBOOL("ClearInvCache", purge_inv);
+                gSavedSettings.setBOOL("ClearNameCache", purge_names);
+                        
+                if (purge_textures || purge_objects || purge_inv || purge_names)
+                {
+                        // flag client cache for clearing next time the client runs
+                        gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
+                }
+
+                self->close();
+        }
+}
+
+// static
+void FloaterCache::onClickCancel(void* data)
+{
+        FloaterCache* self = (FloaterCache*)data;
+        if (self)
+        {
+                self->close();
+        }
+}
diff --git a/linden/indra/newview/floatercache.h b/linden/indra/newview/floatercache.h
new file mode 100644
index 0000000..ea3c53e
--- /dev/null
+++ b/linden/indra/newview/floatercache.h
@@ -0,0 +1,50 @@
+/**
+* @file floatercache.h
+* @brief clear cache window for Imprudence
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef floatercache_h
+#define floatercache_h
+
+#include "llfloater.h"
+
+class FloaterCache : public LLFloater, public LLFloaterSingleton<FloaterCache>
+{
+public:
+
+        FloaterCache(const LLSD& seed);
+        virtual ~FloaterCache();
+        BOOL postBuild();
+
+private:
+
+        static void onClickOK(void* data);
+        static void onClickCancel(void* data);
+};
+
+#endif //floatercache_h
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index c9ab291..2fab25b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2963,10 +2963,11 @@ bool LLAppViewer::initCache()
 {
         mPurgeCache = false;
         // Purge cache if user requested it
-        if (gSavedSettings.getBOOL("PurgeCacheOnStartup") ||
-                gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
+        if (gSavedSettings.getBOOL("PurgeCacheOnStartup") || // cmd-line -- MC
+                gSavedSettings.getBOOL("PurgeCacheOnNextStartup")) // ui -- MC
         {
                 gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false);
+                gSavedSettings.setBOOL("PurgeCacheOnStartup", FALSE);
                 mPurgeCache = true;
         }
         // Purge cache if it belongs to an old version
@@ -3175,10 +3176,61 @@ bool LLAppViewer::initCache()
 
 void LLAppViewer::purgeCache()
 {
-        LL_INFOS("AppCache") << "Purging Cache and Texture Cache..." << llendl;
-        LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
-        std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
-        gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""),mask);
+        LL_INFOS("AppCache") << "Begin purging cachees..." << llendl;
+        if (gSavedSettings.getBOOL("PurgeCacheOnStartup")) // purging from cmd line
+        {
+                LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
+                std::string mask = gDirUtilp->getDirDelimiter() + "*.*";
+                gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), mask);
+        }
+        else // purging cache from ui
+        {
+                if (gSavedSettings.getBOOL("ClearTextureCache"))
+                {
+                        LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
+                        gSavedSettings.setBOOL("ClearTextureCache", FALSE);
+                }
+
+                if (gSavedSettings.getBOOL("ClearObjectCache"))
+                {
+                        std::string mask = gDirUtilp->getDirDelimiter() + "*.slc";
+                        gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), mask);
+                        gSavedSettings.setBOOL("ClearObjectCache", FALSE);
+                }
+
+                if (gSavedSettings.getBOOL("ClearInvCache"))
+                {
+                        std::vector<std::string> masks;
+                        masks.push_back(gDirUtilp->getDirDelimiter() + "*.inv.gz");
+                        masks.push_back(gDirUtilp->getDirDelimiter() + VFS_DATA_FILE_BASE + "*");
+                        masks.push_back(gDirUtilp->getDirDelimiter() + VFS_INDEX_FILE_BASE + "*");
+                        
+                        for (std::vector<std::string>::iterator vIt = masks.begin(); 
+                                vIt != masks.end(); ++vIt)
+                        {
+                                gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), (*vIt));
+                        }
+
+                        gSavedSettings.setBOOL("ClearInvCache", FALSE);
+                }
+
+                if (gSavedSettings.getBOOL("ClearNameCache"))
+                {
+                        // ick @ not making these variables -- MC
+                        std::vector<std::string> masks;
+                        masks.push_back(gDirUtilp->getDirDelimiter() + "name.cache");
+                        masks.push_back(gDirUtilp->getDirDelimiter() + "avatar_name_cache.xml");
+                        masks.push_back(gDirUtilp->getDirDelimiter() + "*.cached_mute");
+                        
+                        for (std::vector<std::string>::iterator vIt = masks.begin(); 
+                                vIt != masks.end(); ++vIt)
+                        {
+                                gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), (*vIt));
+                        }
+
+                        gSavedSettings.setBOOL("ClearNameCache", FALSE);
+                }
+        }
 }
 
 const std::string& LLAppViewer::getSecondLifeTitle() const
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index b4ebe42..70d88d9 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -45,6 +45,7 @@
 #include "llviewerwindow.h"
 
 // project includes
+#include "floatercache.h"
 #include "llcheckboxctrl.h"
 #include "hippogridmanager.h"
 #include "lluictrlfactory.h"
@@ -267,9 +268,8 @@ void LLPanelNetwork::refresh()
 // static
 void LLPanelNetwork::onClickClearDiskCache(void*)
 {
-        // flag client cache for clearing next time the client runs
-        gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
-        LLNotifications::instance().add("CacheWillClear");
+        FloaterCache::getInstance()->open();
+        FloaterCache::getInstance()->center();
 }
 
 // static
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
new file mode 100644
index 0000000..e965b28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -0,0 +1,28 @@
+<?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"
+     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"
+     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+     mouse_opaque="true" name="cache_label" v_pad="0" width="185">
+Cache Will Be Cleared After
+You Restart Imprudence
+  </text>
+  <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear texture cache" left="10"
+     mouse_opaque="true" name="texture_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     initial_value="false" label="Clear object cache" left_delta="0"
+     mouse_opaque="true" name="object_cache" width="185" />
+  <check_box bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20"
+     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 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"
+     label="OK" left="-170" mouse_opaque="true" name="btn_ok" width="80" />
+  <button bottom_delta="0" follows="right|top" font="SansSerif" halign="center" height="22"
+     label="Cancel" left="-85" mouse_opaque="true" name="btn_cancel" width="80" />
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 4474dad..033b01b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -903,13 +903,6 @@ Would you like to disable all popups which can be skipped?
 
 <notification
  icon="notify.tga"
- name="CacheWillClear"
- type="notify">
-Cache will be cleared after you restart [VIEWER_NAME].
-</notification>
-
-<notification
- icon="notify.tga"
  name="CacheWillBeMoved"
  type="notify">
 Cache will be moved after you restart [VIEWER_NAME].