* 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, 21 insertions, 22 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
index 4869f5d..1365e69 100644
--- a/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/GlynnTuckerAssetCache.cs
@@ -45,11 +45,13 @@ namespace OpenSim.Region.CoreModules.Asset
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private bool m_Enabled = false;
-        private ICache m_Cache = new GlynnTucker.Cache.SimpleMemoryCache();
+        private bool m_Enabled;
+        private ICache m_Cache;
+        private ulong m_Hits;
+        private ulong m_Requests;
 
         // Instrumentation
-        private uint m_DebugRate = 0;
+        private uint m_DebugRate;
 
         public Type ReplaceableInterface 
         {
@@ -72,6 +74,7 @@ namespace OpenSim.Region.CoreModules.Asset
 
                 if (name == Name)
                 {
+                    m_Cache = new GlynnTucker.Cache.SimpleMemoryCache();
                     m_Enabled = true;
 
                     m_log.Info("[ASSET CACHE]: GlynnTucker asset cache enabled");
@@ -80,7 +83,6 @@ namespace OpenSim.Region.CoreModules.Asset
                     IConfig cacheConfig = source.Configs["AssetCache"];
                     if (cacheConfig != null)
                         m_DebugRate = (uint)cacheConfig.GetInt("DebugRate", 0);
-
                 }
             }
         }
@@ -117,24 +119,6 @@ namespace OpenSim.Region.CoreModules.Asset
                 m_Cache.AddOrUpdate(asset.ID, asset);
         }
 
-        private ulong m_Hits = 0;
-        private ulong m_Requests = 0;
-        private void Debug(Object asset)
-        {
-            // Temporary instrumentation to measure the hit/miss rate
-            if (m_DebugRate > 0)
-            {
-                m_Requests++;
-                if (asset != null)
-                    m_Hits++;
-
-                if ((m_Requests % m_DebugRate) == 0)
-                    m_log.DebugFormat("[ASSET CACHE]: Hit Rate {0} / {1} == {2}%", m_Hits, m_Requests, ((float)m_Hits / m_Requests) * 100);
-
-            }
-            // End instrumentation
-        }
-
         public AssetBase Get(string id)
         {
             Object asset = null;
@@ -156,5 +140,20 @@ namespace OpenSim.Region.CoreModules.Asset
         {
             m_Cache.Clear();
         }
+
+        private void Debug(Object asset)
+        {
+            // Temporary instrumentation to measure the hit/miss rate
+            if (m_DebugRate > 0)
+            {
+                ++m_Requests;
+                if (asset != null)
+                    ++m_Hits;
+
+                if ((m_Requests % m_DebugRate) == 0)
+                    m_log.DebugFormat("[ASSET CACHE]: Hit Rate {0} / {1} == {2}%", m_Hits, m_Requests, ((float)m_Hits / (float)m_Requests) * 100.0f);
+            }
+            // End instrumentation
+        }
     }
 }