diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
Diffstat (limited to 'OpenSim/Tests/Performance/NPCPerformanceTests.cs')
| -rw-r--r-- | OpenSim/Tests/Performance/NPCPerformanceTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs index 627765b..2026a88 100644 --- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs +++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Tests.Performance | |||
| 58 | /// earlier tests. | 58 | /// earlier tests. |
| 59 | /// </remarks> | 59 | /// </remarks> |
| 60 | [TestFixture] | 60 | [TestFixture] |
| 61 | public class NPCPerformanceTests | 61 | public class NPCPerformanceTests : OpenSimTestCase |
| 62 | { | 62 | { |
| 63 | private TestScene scene; | 63 | private TestScene scene; |
| 64 | private AvatarFactoryModule afm; | 64 | private AvatarFactoryModule afm; |