diff options
| author | BlueWall | 2012-12-07 15:36:43 -0500 |
|---|---|---|
| committer | BlueWall | 2012-12-07 15:36:43 -0500 |
| commit | 0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch) | |
| tree | c48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2 opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz | |
Merge branch 'master' into connector_plugin
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs index 14eca42..0945b43 100644 --- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs +++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs | |||
| @@ -60,8 +60,10 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests | |||
| 60 | protected ILandObject m_lo2; | 60 | protected ILandObject m_lo2; |
| 61 | 61 | ||
| 62 | [SetUp] | 62 | [SetUp] |
| 63 | public void SetUp() | 63 | public override void SetUp() |
| 64 | { | 64 | { |
| 65 | base.SetUp(); | ||
| 66 | |||
| 65 | m_pcm = new PrimCountModule(); | 67 | m_pcm = new PrimCountModule(); |
| 66 | LandManagementModule lmm = new LandManagementModule(); | 68 | LandManagementModule lmm = new LandManagementModule(); |
| 67 | m_scene = new SceneHelpers().SetupScene(); | 69 | m_scene = new SceneHelpers().SetupScene(); |