diff options
author | Justin Clark-Casey (justincc) | 2010-03-12 20:29:17 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-03-12 20:29:17 +0000 |
commit | aad17e751383069b799c6a78a3ac4e0ca1020a4d (patch) | |
tree | 80b18150e5e91711cb25cf1dc64b1d1a6bcb6182 /OpenSim/Tests/Common | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.zip opensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.tar.gz opensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.tar.bz2 opensim-SC_OLD-aad17e751383069b799c6a78a3ac4e0ca1020a4d.tar.xz |
Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone
Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Mock/MockUserAccountService.cs | 1 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockUserAccountService.cs b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs index f5d758a..0769c7a 100644 --- a/OpenSim/Tests/Common/Mock/MockUserAccountService.cs +++ b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs | |||
@@ -34,6 +34,7 @@ namespace OpenSim.Tests.Common.Mock | |||
34 | { | 34 | { |
35 | public class MockUserAccountService : IUserAccountService | 35 | public class MockUserAccountService : IUserAccountService |
36 | { | 36 | { |
37 | |||
37 | public MockUserAccountService(IConfigSource config) {} | 38 | public MockUserAccountService(IConfigSource config) {} |
38 | 39 | ||
39 | public UserAccount GetUserAccount(UUID scopeID, UUID userID) { return new UserAccount(); } | 40 | public UserAccount GetUserAccount(UUID scopeID, UUID userID) { return new UserAccount(); } |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index ab3e7cb..864e2aa 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -215,6 +215,9 @@ namespace OpenSim.Tests.Common.Setup | |||
215 | testScene.PhysicsScene | 215 | testScene.PhysicsScene |
216 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); | 216 | = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test"); |
217 | 217 | ||
218 | // It's really not a good idea to use static variables as they carry over between tests, leading to | ||
219 | // problems that are extremely hard to debug. Really, these static fields need to be eliminated - | ||
220 | // tests using multiple regions that need to share modules need to find another solution. | ||
218 | m_assetService = null; | 221 | m_assetService = null; |
219 | m_inventoryService = null; | 222 | m_inventoryService = null; |
220 | m_gridService = null; | 223 | m_gridService = null; |