* Removing cruft left over from the conversion to the new texture sending and UDP code

* Changing the cache modules to only initialize the caches if they are actually enabled. Should save a bit of resources from unused cache systems

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index 0a7e736..7da5e7a 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -44,10 +44,8 @@ namespace OpenSim.Region.CoreModules.Asset
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private bool m_Enabled = false;
-        private Cache m_Cache = new Cache(CacheMedium.Memory,
-                                          CacheStrategy.Aggressive,
-                                          CacheFlags.AllowUpdate);
+        private bool m_Enabled;
+        private Cache m_Cache;
 
         public string Name
         {
@@ -77,6 +75,7 @@ namespace OpenSim.Region.CoreModules.Asset
                         return;
                     }
 
+                    m_Cache = new Cache(CacheMedium.Memory, CacheStrategy.Aggressive, CacheFlags.AllowUpdate);
                     m_Enabled = true;
 
                     m_log.Info("[ASSET CACHE]: Core asset cache enabled");