diff options
author | Justin Clark-Casey (justincc) | 2011-12-03 18:59:54 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-03 18:59:54 +0000 |
commit | 4919c6056022053f8632b030a06fd8f48ac02a8e (patch) | |
tree | 098bfeaf1aa751f20e2bc4791f26302e74417d05 /OpenSim/Tests/Common/Helpers | |
parent | Improve locking in AgentCircuitManager (diff) | |
download | opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.zip opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.tar.gz opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.tar.bz2 opensim-SC_OLD-4919c6056022053f8632b030a06fd8f48ac02a8e.tar.xz |
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
Diffstat (limited to 'OpenSim/Tests/Common/Helpers')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index d358ae8..e4640be 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -49,6 +49,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts; | |||
49 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence; | 49 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence; |
50 | using OpenSim.Services.Interfaces; | 50 | using OpenSim.Services.Interfaces; |
51 | using OpenSim.Tests.Common.Mock; | 51 | using OpenSim.Tests.Common.Mock; |
52 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
52 | 53 | ||
53 | namespace OpenSim.Tests.Common | 54 | namespace OpenSim.Tests.Common |
54 | { | 55 | { |
@@ -139,6 +140,7 @@ namespace OpenSim.Tests.Common | |||
139 | 140 | ||
140 | testScene.RegionInfo.EstateSettings = new EstateSettings(); | 141 | testScene.RegionInfo.EstateSettings = new EstateSettings(); |
141 | testScene.LoginsDisabled = false; | 142 | testScene.LoginsDisabled = false; |
143 | testScene.RegisterRegionWithGrid(); | ||
142 | 144 | ||
143 | return testScene; | 145 | return testScene; |
144 | } | 146 | } |
@@ -222,6 +224,7 @@ namespace OpenSim.Tests.Common | |||
222 | config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector"); | 224 | config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector"); |
223 | config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData"); | 225 | config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData"); |
224 | config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService"); | 226 | config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService"); |
227 | config.Configs["GridService"].Set("ConnectionString", "!static"); | ||
225 | 228 | ||
226 | LocalGridServicesConnector gridService = new LocalGridServicesConnector(); | 229 | LocalGridServicesConnector gridService = new LocalGridServicesConnector(); |
227 | gridService.Initialise(config); | 230 | gridService.Initialise(config); |