diff options
author | Justin Clark-Casey (justincc) | 2014-03-11 23:38:22 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-03-11 23:38:22 +0000 |
commit | d975b42f6ae01441e261d51976513de422fae3e3 (patch) | |
tree | 0f51e1b2206dfcdb7f0e0561f7c9950749ce23f8 /OpenSim/Tests/Common | |
parent | Don't start KeyframeMotion timers until all the regions are ready. This preve... (diff) | |
download | opensim-SC_OLD-d975b42f6ae01441e261d51976513de422fae3e3.zip opensim-SC_OLD-d975b42f6ae01441e261d51976513de422fae3e3.tar.gz opensim-SC_OLD-d975b42f6ae01441e261d51976513de422fae3e3.tar.bz2 opensim-SC_OLD-d975b42f6ae01441e261d51976513de422fae3e3.tar.xz |
Instead of auto-creating a parcel on request if one doesn't cover a given location, fill in gaps or extend existing parcel right after initial data load.
This is in line with simpler and still existing behaviour where a default parcel is created if no parcels are in storage at all.
Making this change as another step to address current problems with spurious parcels occasionally being created.
Also adds regression tests for different load behaviours depending on existing stored parcel data.
Relates to http://opensimulator.org/mantis/view.php?id=7035
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index 008f2d0..584ca17 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -63,9 +63,9 @@ namespace OpenSim.Tests.Common | |||
63 | /// </summary> | 63 | /// </summary> |
64 | public SceneManager SceneManager { get; private set; } | 64 | public SceneManager SceneManager { get; private set; } |
65 | 65 | ||
66 | public ISimulationDataService SimDataService { get; private set; } | ||
67 | |||
66 | private AgentCircuitManager m_acm = new AgentCircuitManager(); | 68 | private AgentCircuitManager m_acm = new AgentCircuitManager(); |
67 | private ISimulationDataService m_simDataService | ||
68 | = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null); | ||
69 | private IEstateDataService m_estateDataService = null; | 69 | private IEstateDataService m_estateDataService = null; |
70 | 70 | ||
71 | private LocalAssetServicesConnector m_assetService; | 71 | private LocalAssetServicesConnector m_assetService; |
@@ -96,6 +96,9 @@ namespace OpenSim.Tests.Common | |||
96 | m_presenceService.PostInitialise(); | 96 | m_presenceService.PostInitialise(); |
97 | 97 | ||
98 | m_cache = cache; | 98 | m_cache = cache; |
99 | |||
100 | SimDataService | ||
101 | = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null); | ||
99 | } | 102 | } |
100 | 103 | ||
101 | /// <summary> | 104 | /// <summary> |
@@ -139,7 +142,7 @@ namespace OpenSim.Tests.Common | |||
139 | SceneCommunicationService scs = new SceneCommunicationService(); | 142 | SceneCommunicationService scs = new SceneCommunicationService(); |
140 | 143 | ||
141 | TestScene testScene = new TestScene( | 144 | TestScene testScene = new TestScene( |
142 | regInfo, m_acm, scs, m_simDataService, m_estateDataService, configSource, null); | 145 | regInfo, m_acm, scs, SimDataService, m_estateDataService, configSource, null); |
143 | 146 | ||
144 | INonSharedRegionModule godsModule = new GodsModule(); | 147 | INonSharedRegionModule godsModule = new GodsModule(); |
145 | godsModule.Initialise(new IniConfigSource()); | 148 | godsModule.Initialise(new IniConfigSource()); |