Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-05-22 20:23:25 +0100
committer: Melanie 2011-05-22 20:23:25 +0100
commit: be1996f1210ba58ba44f9715de68a3675cf13582 (patch)
tree: 7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
parent: Merge branch 'master' into careminster-presence-refactor (diff)
parent: Add stubs for unimplemented lsl functions (diff)
download: opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.zip
opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.gz
opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.bz2
opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index 6de97b7..ee52a39 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
 namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
 {
author	Melanie	2011-05-22 20:23:25 +0100
committer	Melanie	2011-05-22 20:23:25 +0100
commit	be1996f1210ba58ba44f9715de68a3675cf13582 (patch)
tree	7306bfe8a6e89bd1b2de9f145bea85f2b5645164 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
parent	Merge branch 'master' into careminster-presence-refactor (diff)
parent	Add stubs for unimplemented lsl functions (diff)
download	opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.zip opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.gz opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.bz2 opensim-SC-be1996f1210ba58ba44f9715de68a3675cf13582.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs index 6de97b7..ee52a39 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Communications;
35	using OpenSim.Region.Framework.Scenes;	35	using OpenSim.Region.Framework.Scenes;
36	using OpenSim.Tests.Common;	36	using OpenSim.Tests.Common;
37	using OpenSim.Tests.Common.Mock;	37	using OpenSim.Tests.Common.Mock;
38	using OpenSim.Tests.Common.Setup;
39		38
40	namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests	39	namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
41	{	40	{