diff options
author | Melanie Thielker | 2009-05-18 23:18:04 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-18 23:18:04 +0000 |
commit | 23d902be42fd6d554a9098936d501609fc6e5315 (patch) | |
tree | 1830b906665ffa34b3f7c085e28d87ee16bf4c9f /OpenSim/Tests/Common | |
parent | Bug fix and config rename. (diff) | |
download | opensim-SC_OLD-23d902be42fd6d554a9098936d501609fc6e5315.zip opensim-SC_OLD-23d902be42fd6d554a9098936d501609fc6e5315.tar.gz opensim-SC_OLD-23d902be42fd6d554a9098936d501609fc6e5315.tar.bz2 opensim-SC_OLD-23d902be42fd6d554a9098936d501609fc6e5315.tar.xz |
Remove the old asset cache and local services and the configurations for them
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 11 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 3 |
2 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index 44efb8c..7589e3e 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | |||
@@ -57,9 +57,6 @@ namespace OpenSim.Tests.Common.Mock | |||
57 | public TestCommunicationsManager(NetworkServersInfo serversInfo) | 57 | public TestCommunicationsManager(NetworkServersInfo serversInfo) |
58 | : base(serversInfo, new BaseHttpServer(666), null, false, null) | 58 | : base(serversInfo, new BaseHttpServer(666), null, false, null) |
59 | { | 59 | { |
60 | SQLAssetServer assetService = new SQLAssetServer(new TestAssetDataPlugin()); | ||
61 | m_assetCache = new AssetCache(assetService); | ||
62 | |||
63 | LocalInventoryService lis = new LocalInventoryService(); | 60 | LocalInventoryService lis = new LocalInventoryService(); |
64 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); | 61 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); |
65 | lis.AddPlugin(m_inventoryDataPlugin); | 62 | lis.AddPlugin(m_inventoryDataPlugin); |
@@ -76,13 +73,5 @@ namespace OpenSim.Tests.Common.Mock | |||
76 | LocalBackEndServices gs = new LocalBackEndServices(); | 73 | LocalBackEndServices gs = new LocalBackEndServices(); |
77 | m_gridService = gs; | 74 | m_gridService = gs; |
78 | } | 75 | } |
79 | |||
80 | /// <summary> | ||
81 | /// Start services that take care of business using their own threads. | ||
82 | /// </summary> | ||
83 | public void StartServices() | ||
84 | { | ||
85 | m_assetCache.AssetServer.Start(); | ||
86 | } | ||
87 | } | 76 | } |
88 | } | 77 | } |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index b64b840..434b734 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -147,9 +147,6 @@ namespace OpenSim.Tests.Common.Setup | |||
147 | testScene.PhysicsScene | 147 | testScene.PhysicsScene |
148 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test"); | 148 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test"); |
149 | 149 | ||
150 | if (startServices) | ||
151 | cm.StartServices(); | ||
152 | |||
153 | return testScene; | 150 | return testScene; |
154 | } | 151 | } |
155 | 152 | ||