diff options
| author | Melanie | 2012-10-17 00:12:30 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-17 00:12:30 +0100 |
| commit | 39cbf4f7a114dca999afc42c74bfd100212e3842 (patch) | |
| tree | b0b3f9f1350b92eca7dea1460a679dfa8d0ea378 /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make BasicCircuitTests.SetUp() call overriden base method instead of i... (diff) | |
| download | opensim-SC_OLD-39cbf4f7a114dca999afc42c74bfd100212e3842.zip opensim-SC_OLD-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.gz opensim-SC_OLD-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.bz2 opensim-SC_OLD-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs index fa9378c..556df30 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | |||
| @@ -65,8 +65,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | [SetUp] | 67 | [SetUp] |
| 68 | public void SetUp() | 68 | public override void SetUp() |
| 69 | { | 69 | { |
| 70 | base.SetUp(); | ||
| 70 | m_scene = new SceneHelpers().SetupScene(); | 71 | m_scene = new SceneHelpers().SetupScene(); |
| 71 | } | 72 | } |
| 72 | 73 | ||