diff options
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs index 646e5fa..1cd8ae9 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | |||
| @@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
| 51 | /// Scene presence animation tests | 51 | /// Scene presence animation tests |
| 52 | /// </summary> | 52 | /// </summary> |
| 53 | [TestFixture] | 53 | [TestFixture] |
| 54 | public class ScenePresenceAnimationTests | 54 | public class ScenePresenceAnimationTests : OpenSimTestCase |
| 55 | { | 55 | { |
| 56 | [Test] | 56 | [Test] |
| 57 | public void TestFlyingAnimation() | 57 | public void TestFlyingAnimation() |