diff options
author | Melanie Thielker | 2009-05-10 12:27:05 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-10 12:27:05 +0000 |
commit | d8e1842d2507b2c18b21671ed01496b3a2c59e18 (patch) | |
tree | 2ae57cf45dd1b22fe48b72b85c952258d87f60b6 /OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs | |
parent | Fix the build break (diff) | |
download | opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.zip opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.gz opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.bz2 opensim-SC_OLD-d8e1842d2507b2c18b21671ed01496b3a2c59e18.tar.xz |
Add some asset cache plumbing. Change the generic cache from UUID to string
keys to allow caching the new crop of URI identified objects.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs index 24ac8be..0a0f634 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using log4net; | 28 | using log4net; |
29 | using Nini.Config; | 29 | using Nini.Config; |
30 | using System; | 30 | using System; |
31 | using System.Collections.Generic; | ||
31 | using System.Reflection; | 32 | using System.Reflection; |
32 | using OpenSim.Servers.Base; | 33 | using OpenSim.Servers.Base; |
33 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
@@ -42,6 +43,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset | |||
42 | LogManager.GetLogger( | 43 | LogManager.GetLogger( |
43 | MethodBase.GetCurrentMethod().DeclaringType); | 44 | MethodBase.GetCurrentMethod().DeclaringType); |
44 | 45 | ||
46 | private Dictionary<Scene, IImprovedAssetCache> m_AssetCache = | ||
47 | new Dictionary<Scene, IImprovedAssetCache>(); | ||
48 | |||
45 | private IAssetService m_AssetService; | 49 | private IAssetService m_AssetService; |
46 | 50 | ||
47 | private bool m_Enabled = false; | 51 | private bool m_Enabled = false; |
@@ -109,10 +113,29 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset | |||
109 | 113 | ||
110 | public void RemoveRegion(Scene scene) | 114 | public void RemoveRegion(Scene scene) |
111 | { | 115 | { |
116 | if (!m_Enabled) | ||
117 | return; | ||
118 | |||
119 | m_AssetCache.Remove(scene); | ||
112 | } | 120 | } |
113 | 121 | ||
114 | public void RegionLoaded(Scene scene) | 122 | public void RegionLoaded(Scene scene) |
115 | { | 123 | { |
124 | if (!m_Enabled) | ||
125 | return; | ||
126 | |||
127 | m_AssetCache[scene] = | ||
128 | scene.RequestModuleInterface<IImprovedAssetCache>(); | ||
129 | |||
130 | m_log.InfoFormat("[ASSET CONNECTOR]: Enabled local assets for region {0}", scene.RegionInfo.RegionName); | ||
131 | |||
132 | m_AssetCache[scene] = | ||
133 | scene.RequestModuleInterface<IImprovedAssetCache>(); | ||
134 | |||
135 | if (m_AssetCache[scene] != null) | ||
136 | { | ||
137 | m_log.InfoFormat("[ASSET CONNECTOR]: Enabled asset caching for region {0}", scene.RegionInfo.RegionName); | ||
138 | } | ||
116 | } | 139 | } |
117 | } | 140 | } |
118 | } | 141 | } |