From df16532858bdaad841328a798d698d5c726eb472 Mon Sep 17 00:00:00 2001
From: diva <diva@metaverseink.com>
Date: Mon, 18 May 2009 23:15:50 +0000
Subject: [PATCH] Bug fix and config rename.

---
 OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs | 3 ++-
 bin/OpenSim.ini.example                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index cd475bda02..75ae18cb19 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -109,7 +109,8 @@ namespace OpenSim.Region.CoreModules.Asset
 
         public void Cache(AssetBase asset)
         {
-            m_Cache.Store(asset.ID, asset);
+            if (asset != null)
+                m_Cache.Store(asset.ID, asset);
         }
 
         public AssetBase Get(string id)
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 4dc55bb392..b46bf1e3d4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1279,7 +1279,7 @@
     ;AssetServices = "HGAssetBroker"
 
 	; If you don't want asset caching in the regions, comment this
-    AssetCaching = "CoreAssetCache"
+    AssetCache = "CoreAssetCache"
 
     ; Choose one
     ;UserServices = "LocalUserServicesConnector"