diff options
author | Justin Clarke Casey | 2009-02-16 19:15:16 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-16 19:15:16 +0000 |
commit | 93837807ffb24e5811368063b9231a9d8b018d9d (patch) | |
tree | 5da8dcbc3fd6e6e4c7003e486f0ad26bd7c43d87 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | * Iniital inventory archive test code. Doesn't actually do any testing yet (diff) | |
download | opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.zip opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.gz opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.bz2 opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.xz |
* refactor: remove AssetCache field hanging off Scene
* This is always available at Scene.CommsManager.AssetCache
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0f57b7c..c3ab5e9 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -268,7 +268,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
268 | 268 | ||
269 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, | 269 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, |
270 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 270 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
271 | IAssetCache assetCach, StorageManager storeManager, | 271 | StorageManager storeManager, |
272 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, | 272 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
273 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | 273 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) |
274 | { | 274 | { |
@@ -281,7 +281,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
281 | CommsManager = commsMan; | 281 | CommsManager = commsMan; |
282 | m_sceneGridService = sceneGridService; | 282 | m_sceneGridService = sceneGridService; |
283 | m_storageManager = storeManager; | 283 | m_storageManager = storeManager; |
284 | AssetCache = assetCach; | ||
285 | m_regInfo = regInfo; | 284 | m_regInfo = regInfo; |
286 | m_regionHandle = m_regInfo.RegionHandle; | 285 | m_regionHandle = m_regInfo.RegionHandle; |
287 | m_regionName = m_regInfo.RegionName; | 286 | m_regionName = m_regInfo.RegionName; |
@@ -3543,7 +3542,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3543 | group.GetPartDescription(localID), | 3542 | group.GetPartDescription(localID), |
3544 | (sbyte)AssetType.Object, | 3543 | (sbyte)AssetType.Object, |
3545 | Utils.StringToBytes(sceneObjectXml)); | 3544 | Utils.StringToBytes(sceneObjectXml)); |
3546 | AssetCache.AddAsset(asset); | 3545 | CommsManager.AssetCache.AddAsset(asset); |
3547 | 3546 | ||
3548 | InventoryItemBase item = new InventoryItemBase(); | 3547 | InventoryItemBase item = new InventoryItemBase(); |
3549 | item.Creator = part.CreatorID; | 3548 | item.Creator = part.CreatorID; |