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/Region/OptionalModules/World/NPC | |
| 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/Region/OptionalModules/World/NPC')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index 52ed846..a522277 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||
| @@ -48,7 +48,7 @@ using OpenSim.Tests.Common.Mock; | |||
| 48 | namespace OpenSim.Region.OptionalModules.World.NPC.Tests | 48 | namespace OpenSim.Region.OptionalModules.World.NPC.Tests |
| 49 | { | 49 | { |
| 50 | [TestFixture] | 50 | [TestFixture] |
| 51 | public class NPCModuleTests | 51 | public class NPCModuleTests : OpenSimTestCase |
| 52 | { | 52 | { |
| 53 | private TestScene m_scene; | 53 | private TestScene m_scene; |
| 54 | private AvatarFactoryModule m_afMod; | 54 | private AvatarFactoryModule m_afMod; |