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/PrimeNumberHelperTests.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 'OpenSim/Framework/Tests/PrimeNumberHelperTests.cs')
| -rw-r--r-- | OpenSim/Framework/Tests/PrimeNumberHelperTests.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs index 36bc6e7..82e13e5 100644 --- a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs +++ b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs | |||
| @@ -31,11 +31,12 @@ using NUnit.Framework; | |||
| 31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
| 32 | using OpenMetaverse.StructuredData; | 32 | using OpenMetaverse.StructuredData; |
| 33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
| 34 | using OpenSim.Tests.Common; | ||
| 34 | 35 | ||
| 35 | namespace OpenSim.Framework.Tests | 36 | namespace OpenSim.Framework.Tests |
| 36 | { | 37 | { |
| 37 | [TestFixture] | 38 | [TestFixture] |
| 38 | public class PrimeNumberHelperTests | 39 | public class PrimeNumberHelperTests : OpenSimTestCase |
| 39 | { | 40 | { |
| 40 | [Test] | 41 | [Test] |
| 41 | public void TestGetPrime() | 42 | public void TestGetPrime() |