Merge branch 'master' into connector_plugin

Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
author: BlueWall 2012-11-25 17:03:14 -0500
committer: BlueWall 2012-11-25 17:03:14 -0500
commit: c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree: dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
parent: Merge branch 'master' into connector_plugin (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index ac638f1..c1bdacb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
    /// Basic groups module tests
    /// </summary>
    [TestFixture]
-    public class GroupsModuleTests
+    public class GroupsModuleTests : OpenSimTestCase
    {
        [Test]
        public void TestBasic()
author	BlueWall	2012-11-25 17:03:14 -0500
committer	BlueWall	2012-11-25 17:03:14 -0500
commit	c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree	dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
parent	Merge branch 'master' into connector_plugin (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs index ac638f1..c1bdacb 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
42	/// Basic groups module tests	42	/// Basic groups module tests
43	/// </summary>	43	/// </summary>
44	[TestFixture]	44	[TestFixture]
45	public class GroupsModuleTests	45	public class GroupsModuleTests : OpenSimTestCase
46	{	46	{
47	[Test]	47	[Test]
48	public void TestBasic()	48	public void TestBasic()