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/SceneTests.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/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index abcce66..13d93f9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 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/SceneTests.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/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index abcce66..13d93f9 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -43,7 +43,6 @@ using OpenSim.Region.CoreModules.World.Serialiser;
43	using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;	43	using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
44	using OpenSim.Tests.Common;	44	using OpenSim.Tests.Common;
45	using OpenSim.Tests.Common.Mock;	45	using OpenSim.Tests.Common.Mock;
46	using OpenSim.Tests.Common.Setup;
47		46
48	namespace OpenSim.Region.Framework.Scenes.Tests	47	namespace OpenSim.Region.Framework.Scenes.Tests
49	{	48	{