diff options
| author | Justin Clark-Casey (justincc) | 2011-02-18 23:50:54 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-02-18 23:50:54 +0000 |
| commit | 60fe3d48ee83f004861044c51537256c0c389478 (patch) | |
| tree | d3ebc3be0f1cd5a22861eea533159a503c2426ef /OpenSim/Tests | |
| parent | If GridService.GetNeighbours() could not find the region then log a warning r... (diff) | |
| download | opensim-SC-60fe3d48ee83f004861044c51537256c0c389478.zip opensim-SC-60fe3d48ee83f004861044c51537256c0c389478.tar.gz opensim-SC-60fe3d48ee83f004861044c51537256c0c389478.tar.bz2 opensim-SC-60fe3d48ee83f004861044c51537256c0c389478.tar.xz | |
Put some CapabilitiesModule null checks in Scene
Stop tests setting up a capabilities module by default
Diffstat (limited to 'OpenSim/Tests')
| -rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 7 | ||||
| -rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index dc0d4de..ebe0a72 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
| @@ -560,8 +560,11 @@ namespace OpenSim.Tests.Common.Mock | |||
| 560 | agentData.lastname = m_lastName; | 560 | agentData.lastname = m_lastName; |
| 561 | 561 | ||
| 562 | ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); | 562 | ICapabilitiesModule capsModule = m_scene.RequestModuleInterface<ICapabilitiesModule>(); |
| 563 | agentData.CapsPath = capsModule.GetCapsPath(m_agentId); | 563 | if (capsModule != null) |
| 564 | agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId)); | 564 | { |
| 565 | agentData.CapsPath = capsModule.GetCapsPath(m_agentId); | ||
| 566 | agentData.ChildrenCapSeeds = new Dictionary<ulong, string>(capsModule.GetChildrenSeeds(m_agentId)); | ||
| 567 | } | ||
| 565 | 568 | ||
| 566 | return agentData; | 569 | return agentData; |
| 567 | } | 570 | } |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index d199e42..9142616 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
| @@ -164,10 +164,10 @@ namespace OpenSim.Tests.Common.Setup | |||
| 164 | TestScene testScene = new TestScene( | 164 | TestScene testScene = new TestScene( |
| 165 | regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null); | 165 | regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null); |
| 166 | 166 | ||
| 167 | INonSharedRegionModule capsModule = new CapabilitiesModule(); | 167 | // INonSharedRegionModule capsModule = new CapabilitiesModule(); |
| 168 | capsModule.Initialise(new IniConfigSource()); | 168 | // capsModule.Initialise(new IniConfigSource()); |
| 169 | testScene.AddRegionModule(capsModule.Name, capsModule); | 169 | // testScene.AddRegionModule(capsModule.Name, capsModule); |
| 170 | capsModule.AddRegion(testScene); | 170 | // capsModule.AddRegion(testScene); |
| 171 | 171 | ||
| 172 | IRegionModule godsModule = new GodsModule(); | 172 | IRegionModule godsModule = new GodsModule(); |
| 173 | godsModule.Initialise(testScene, new IniConfigSource()); | 173 | godsModule.Initialise(testScene, new IniConfigSource()); |