diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | 4 |
2 files changed, 3 insertions, 3 deletions
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 | |||
129 | { | 129 | { |
130 | AssetBase asset1 = new AssetBase(); | 130 | AssetBase asset1 = new AssetBase(); |
131 | Copy(asset, asset1); | 131 | Copy(asset, asset1); |
132 | m_scene.AssetCache.AssetServer.StoreAsset(asset1); | 132 | m_scene.CommsManager.AssetCache.AssetServer.StoreAsset(asset1); |
133 | } | 133 | } |
134 | return true; | 134 | return true; |
135 | } | 135 | } |
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 | |||
49 | 49 | ||
50 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, | 50 | public HGScene(RegionInfo regInfo, AgentCircuitManager authen, |
51 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 51 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
52 | IAssetCache assetCach, StorageManager storeManager, | 52 | StorageManager storeManager, |
53 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 53 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
54 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 54 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
55 | : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader, | 55 | : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader, |
56 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) | 56 | dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) |
57 | { | 57 | { |
58 | m_log.Info("[HGScene]: Starting HGScene."); | 58 | m_log.Info("[HGScene]: Starting HGScene."); |