diff options
author | Diva Canto | 2012-11-14 07:50:19 -0800 |
---|---|---|
committer | Diva Canto | 2012-11-14 07:50:19 -0800 |
commit | c88e6fb44505ff5530b2723665f81a232eb630ad (patch) | |
tree | 4f2e200f4c8926600f0752e395fc91acfd8e8023 /OpenSim | |
parent | Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which... (diff) | |
download | opensim-SC-c88e6fb44505ff5530b2723665f81a232eb630ad.zip opensim-SC-c88e6fb44505ff5530b2723665f81a232eb630ad.tar.gz opensim-SC-c88e6fb44505ff5530b2723665f81a232eb630ad.tar.bz2 opensim-SC-c88e6fb44505ff5530b2723665f81a232eb630ad.tar.xz |
Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset service)
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 232d9f5..8e800cb 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -222,10 +222,6 @@ namespace OpenSim.Region.CoreModules.Asset | |||
222 | scene.RegisterModuleInterface<IImprovedAssetCache>(this); | 222 | scene.RegisterModuleInterface<IImprovedAssetCache>(this); |
223 | m_Scenes.Add(scene); | 223 | m_Scenes.Add(scene); |
224 | 224 | ||
225 | if (m_AssetService == null) | ||
226 | { | ||
227 | m_AssetService = scene.RequestModuleInterface<IAssetService>(); | ||
228 | } | ||
229 | } | 225 | } |
230 | } | 226 | } |
231 | 227 | ||
@@ -240,6 +236,8 @@ namespace OpenSim.Region.CoreModules.Asset | |||
240 | 236 | ||
241 | public void RegionLoaded(Scene scene) | 237 | public void RegionLoaded(Scene scene) |
242 | { | 238 | { |
239 | if (m_Enabled && m_AssetService == null) | ||
240 | m_AssetService = scene.RequestModuleInterface<IAssetService>(); | ||
243 | } | 241 | } |
244 | 242 | ||
245 | //////////////////////////////////////////////////////////// | 243 | //////////////////////////////////////////////////////////// |