Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset service)
parent
790b595aa0
commit
c88e6fb445
|
@ -222,10 +222,6 @@ namespace OpenSim.Region.CoreModules.Asset
|
||||||
scene.RegisterModuleInterface<IImprovedAssetCache>(this);
|
scene.RegisterModuleInterface<IImprovedAssetCache>(this);
|
||||||
m_Scenes.Add(scene);
|
m_Scenes.Add(scene);
|
||||||
|
|
||||||
if (m_AssetService == null)
|
|
||||||
{
|
|
||||||
m_AssetService = scene.RequestModuleInterface<IAssetService>();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -240,6 +236,8 @@ namespace OpenSim.Region.CoreModules.Asset
|
||||||
|
|
||||||
public void RegionLoaded(Scene scene)
|
public void RegionLoaded(Scene scene)
|
||||||
{
|
{
|
||||||
|
if (m_Enabled && m_AssetService == null)
|
||||||
|
m_AssetService = scene.RequestModuleInterface<IAssetService>();
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
|
Loading…
Reference in New Issue