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/CoreModules/Avatar
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
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 848b3bf..1830d41 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -39,7 +39,7 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
    [TestFixture]
-    public class AvatarFactoryModuleTests
+    public class AvatarFactoryModuleTests : OpenSimTestCase
    {
        /// <summary>
        /// Only partial right now since we don't yet test that it's ended up in the avatar appearance service.
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
index 7a197f7..961117e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -40,7 +40,7 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
 {
    [TestFixture]
-    public class FriendsModuleTests
+    public class FriendsModuleTests : OpenSimTestCase
    {
        private FriendsModule m_fm;
        private TestScene m_scene;
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/CoreModules/Avatar
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/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs index 848b3bf..1830d41 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -39,7 +39,7 @@ using OpenSim.Tests.Common.Mock;
39	namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory	39	namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
40	{	40	{
41	[TestFixture]	41	[TestFixture]
42	public class AvatarFactoryModuleTests	42	public class AvatarFactoryModuleTests : OpenSimTestCase
43	{	43	{
44	/// <summary>	44	/// <summary>
45	/// Only partial right now since we don't yet test that it's ended up in the avatar appearance service.	45	/// Only partial right now since we don't yet test that it's ended up in the avatar appearance service.


diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs index 7a197f7..961117e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -40,7 +40,7 @@ using OpenSim.Tests.Common.Mock;
40	namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests	40	namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
41	{	41	{
42	[TestFixture]	42	[TestFixture]
43	public class FriendsModuleTests	43	public class FriendsModuleTests : OpenSimTestCase
44	{	44	{
45	private FriendsModule m_fm;	45	private FriendsModule m_fm;
46	private TestScene m_scene;	46	private TestScene m_scene;