aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-16 19:15:16 +0000
committerJustin Clarke Casey2009-02-16 19:15:16 +0000
commit93837807ffb24e5811368063b9231a9d8b018d9d (patch)
tree5da8dcbc3fd6e6e4c7003e486f0ad26bd7c43d87 /OpenSim/Region/Application
parent* Iniital inventory archive test code. Doesn't actually do any testing yet (diff)
downloadopensim-SC-93837807ffb24e5811368063b9231a9d8b018d9d.zip
opensim-SC-93837807ffb24e5811368063b9231a9d8b018d9d.tar.gz
opensim-SC-93837807ffb24e5811368063b9231a9d8b018d9d.tar.bz2
opensim-SC-93837807ffb24e5811368063b9231a9d8b018d9d.tar.xz
* refactor: remove AssetCache field hanging off Scene
* This is always available at Scene.CommsManager.AssetCache
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 8778acd..cf0f917 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -130,7 +130,7 @@ namespace OpenSim
130 130
131 return 131 return
132 new HGScene( 132 new HGScene(
133 regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, storageManager, 133 regionInfo, circuitManager, m_commsManager, sceneGridService, storageManager,
134 m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, 134 m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim,
135 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 135 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
136 } 136 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8198138..add7cb9 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -663,7 +663,7 @@ namespace OpenSim
663 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager); 663 SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
664 664
665 return new Scene( 665 return new Scene(
666 regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, 666 regionInfo, circuitManager, m_commsManager, sceneGridService,
667 storageManager, m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim, 667 storageManager, m_moduleLoader, m_configSettings.DumpAssetsToFile, m_configSettings.PhysicalPrim,
668 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); 668 m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
669 } 669 }