From 93837807ffb24e5811368063b9231a9d8b018d9d Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 16 Feb 2009 19:15:16 +0000 Subject: * refactor: remove AssetCache field hanging off Scene * This is always available at Scene.CommsManager.AssetCache --- OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | 2 +- OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid') diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs index 4039288..1f01fa2 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs @@ -129,7 +129,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid { AssetBase asset1 = new AssetBase(); Copy(asset, asset1); - m_scene.AssetCache.AssetServer.StoreAsset(asset1); + m_scene.CommsManager.AssetCache.AssetServer.StoreAsset(asset1); } return true; } diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index ea03cf9..423acc1 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs @@ -49,10 +49,10 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid public HGScene(RegionInfo regInfo, AgentCircuitManager authen, CommunicationsManager commsMan, SceneCommunicationService sceneGridService, - IAssetCache assetCach, StorageManager storeManager, + StorageManager storeManager, ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) - : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader, + : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader, dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) { m_log.Info("[HGScene]: Starting HGScene."); -- cgit v1.1