diff options
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Tests/Performance/ScriptPerformanceTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs index d708abd..4064edc 100644 --- a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs +++ b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs | |||
| @@ -53,7 +53,7 @@ namespace OpenSim.Tests.Performance | |||
| 53 | /// earlier tests. | 53 | /// earlier tests. |
| 54 | /// </remarks> | 54 | /// </remarks> |
| 55 | [TestFixture] | 55 | [TestFixture] |
| 56 | public class ScriptPerformanceTests | 56 | public class ScriptPerformanceTests : OpenSimTestCase |
| 57 | { | 57 | { |
| 58 | private TestScene m_scene; | 58 | private TestScene m_scene; |
| 59 | private XEngine m_xEngine; | 59 | private XEngine m_xEngine; |