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/SceneObjectDeRezTests.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/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 0d26026..5357a06 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Region.Framework.Scenes;
 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/SceneObjectDeRezTests.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/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 0d26026..5357a06 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -37,7 +37,6 @@ using OpenSim.Region.CoreModules.World.Permissions;
37	using OpenSim.Region.Framework.Scenes;	37	using OpenSim.Region.Framework.Scenes;
38	using OpenSim.Tests.Common;	38	using OpenSim.Tests.Common;
39	using OpenSim.Tests.Common.Mock;	39	using OpenSim.Tests.Common.Mock;
40	using OpenSim.Tests.Common.Setup;
41		40
42	namespace OpenSim.Region.Framework.Scenes.Tests	41	namespace OpenSim.Region.Framework.Scenes.Tests
43	{	42	{