diff options
| author | Melanie | 2012-11-25 14:13:50 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-25 14:13:50 +0000 |
| commit | fd7a83f439132062d500471830eb26e7183d30bc (patch) | |
| tree | db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Framework/Tests/AnimationTests.cs | |
| parent | Merge branch 'careminster' into avination (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Tests/AnimationTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs index 967a355..f3be81b 100644 --- a/OpenSim/Framework/Tests/AnimationTests.cs +++ b/OpenSim/Framework/Tests/AnimationTests.cs | |||
| @@ -38,7 +38,7 @@ using Animation = OpenSim.Framework.Animation; | |||
| 38 | namespace OpenSim.Framework.Tests | 38 | namespace OpenSim.Framework.Tests |
| 39 | { | 39 | { |
| 40 | [TestFixture] | 40 | [TestFixture] |
| 41 | public class AnimationTests | 41 | public class AnimationTests : OpenSimTestCase |
| 42 | { | 42 | { |
| 43 | private Animation anim1 = null; | 43 | private Animation anim1 = null; |
| 44 | private Animation anim2 = null; | 44 | private Animation anim2 = null; |