Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2012-11-27 14:43:01 -0800
committer: Diva Canto 2012-11-27 14:43:01 -0800
commit: a82f699f4348ea1ab139ab338973c9cee04df712 (patch)
tree: d1bf4948670e1d207fe4f6c60f6b7771e1625839 /OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
parent: Prevent the core Groups module from being enabled when its name doesn't match... (diff)
parent: BulletSim: reorganize linear movement routine into separate subroutines enabl... (diff)
download: opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.zip
opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.gz
opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.bz2
opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.xz
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;
 namespace OpenSim.Region.OptionalModules.World.NPC.Tests
 {
    [TestFixture]
-    public class NPCModuleTests
+    public class NPCModuleTests : OpenSimTestCase
    {
        private TestScene m_scene;
        private AvatarFactoryModule m_afMod;
author	Diva Canto	2012-11-27 14:43:01 -0800
committer	Diva Canto	2012-11-27 14:43:01 -0800
commit	a82f699f4348ea1ab139ab338973c9cee04df712 (patch)
tree	d1bf4948670e1d207fe4f6c60f6b7771e1625839 /OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
parent	Prevent the core Groups module from being enabled when its name doesn't match... (diff)
parent	BulletSim: reorganize linear movement routine into separate subroutines enabl... (diff)
download	opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.zip opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.gz opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.bz2 opensim-SC_OLD-a82f699f4348ea1ab139ab338973c9cee04df712.tar.xz

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;