diff options
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Tests/Performance/ObjectPerformanceTests.cs')
| -rw-r--r-- | OpenSim/Tests/Performance/ObjectPerformanceTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs index 2264d86..656a971 100644 --- a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs +++ b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs | |||
| @@ -47,7 +47,7 @@ namespace OpenSim.Tests.Performance | |||
| 47 | /// earlier tests. | 47 | /// earlier tests. |
| 48 | /// </remarks> | 48 | /// </remarks> |
| 49 | [TestFixture] | 49 | [TestFixture] |
| 50 | public class ObjectPerformanceTests | 50 | public class ObjectPerformanceTests : OpenSimTestCase |
| 51 | { | 51 | { |
| 52 | [TearDown] | 52 | [TearDown] |
| 53 | public void TearDown() | 53 | public void TearDown() |