aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-05-18 23:15:50 +0000
committerdiva2009-05-18 23:15:50 +0000
commitdf16532858bdaad841328a798d698d5c726eb472 (patch)
treed90ad9cf2040f556a3018f67425dcd76fb451b36
parentRemoving the last reference to CommsManager.AssetCache. (diff)
downloadopensim-SC_OLD-df16532858bdaad841328a798d698d5c726eb472.zip
opensim-SC_OLD-df16532858bdaad841328a798d698d5c726eb472.tar.gz
opensim-SC_OLD-df16532858bdaad841328a798d698d5c726eb472.tar.bz2
opensim-SC_OLD-df16532858bdaad841328a798d698d5c726eb472.tar.xz
Bug fix and config rename.
-rw-r--r--OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs3
-rw-r--r--bin/OpenSim.ini.example2
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
index cd475bd..75ae18c 100644
--- a/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CoreAssetCache.cs
@@ -109,7 +109,8 @@ namespace OpenSim.Region.CoreModules.Asset
109 109
110 public void Cache(AssetBase asset) 110 public void Cache(AssetBase asset)
111 { 111 {
112 m_Cache.Store(asset.ID, asset); 112 if (asset != null)
113 m_Cache.Store(asset.ID, asset);
113 } 114 }
114 115
115 public AssetBase Get(string id) 116 public AssetBase Get(string id)
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 4dc55bb..b46bf1e 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1279,7 +1279,7 @@
1279 ;AssetServices = "HGAssetBroker" 1279 ;AssetServices = "HGAssetBroker"
1280 1280
1281 ; If you don't want asset caching in the regions, comment this 1281 ; If you don't want asset caching in the regions, comment this
1282 AssetCaching = "CoreAssetCache" 1282 AssetCache = "CoreAssetCache"
1283 1283
1284 ; Choose one 1284 ; Choose one
1285 ;UserServices = "LocalUserServicesConnector" 1285 ;UserServices = "LocalUserServicesConnector"