Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

author: Tom 2011-05-26 03:42:45 -0700
committer: Tom 2011-05-26 03:42:45 -0700
commit: 03525959c96a76cf555923f9441407bddd538398 (patch)
tree: 2c293d455250908de315bd2de805e510538963d3 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
parent: Some additional protection, it seems that responsedata needs to be locked, bu... (diff)
parent: Add PayPrice to serialization format Xml2 (diff)
download: opensim-SC-03525959c96a76cf555923f9441407bddd538398.zip
opensim-SC-03525959c96a76cf555923f9441407bddd538398.tar.gz
opensim-SC-03525959c96a76cf555923f9441407bddd538398.tar.bz2
opensim-SC-03525959c96a76cf555923f9441407bddd538398.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index 8876a43..77bd4c2 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -40,7 +40,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
-using OpenSim.Tests.Common.Setup;
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
author	Tom	2011-05-26 03:42:45 -0700
committer	Tom	2011-05-26 03:42:45 -0700
commit	03525959c96a76cf555923f9441407bddd538398 (patch)
tree	2c293d455250908de315bd2de805e510538963d3 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
parent	Some additional protection, it seems that responsedata needs to be locked, bu... (diff)
parent	Add PayPrice to serialization format Xml2 (diff)
download	opensim-SC-03525959c96a76cf555923f9441407bddd538398.zip opensim-SC-03525959c96a76cf555923f9441407bddd538398.tar.gz opensim-SC-03525959c96a76cf555923f9441407bddd538398.tar.bz2 opensim-SC-03525959c96a76cf555923f9441407bddd538398.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs index 8876a43..77bd4c2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -40,7 +40,6 @@ using OpenSim.Region.Framework.Scenes;
40	using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups;	40	using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups;
41	using OpenSim.Tests.Common;	41	using OpenSim.Tests.Common;
42	using OpenSim.Tests.Common.Mock;	42	using OpenSim.Tests.Common.Mock;
43	using OpenSim.Tests.Common.Setup;
44		43
45	namespace OpenSim.Region.Framework.Scenes.Tests	44	namespace OpenSim.Region.Framework.Scenes.Tests
46	{	45	{