diff options
| author | Melanie | 2013-04-28 19:03:39 +0200 |
|---|---|---|
| committer | Melanie | 2013-04-28 19:03:39 +0200 |
| commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
| tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /OpenSim/Tests/Performance/NPCPerformanceTests.cs | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Controller module for dynamic floaters (WIP) (diff) | |
| download | opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
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 afda574..fde1b91 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; |