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/Media | |
| 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/Media')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs index ba4b041..03a96a4 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs | |||
| @@ -50,8 +50,10 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests | |||
| 50 | protected MoapModule m_module; | 50 | protected MoapModule m_module; |
| 51 | 51 | ||
| 52 | [SetUp] | 52 | [SetUp] |
| 53 | public void SetUp() | 53 | public override void SetUp() |
| 54 | { | 54 | { |
| 55 | base.SetUp(); | ||
| 56 | |||
| 55 | m_module = new MoapModule(); | 57 | m_module = new MoapModule(); |
| 56 | m_scene = new SceneHelpers().SetupScene(); | 58 | m_scene = new SceneHelpers().SetupScene(); |
| 57 | SceneHelpers.SetupSceneModules(m_scene, m_module); | 59 | SceneHelpers.SetupSceneModules(m_scene, m_module); |