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/ScriptEngine/XEngine/Tests/XEngineTest.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/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index 045abb4..b635d5c 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using Nini.Config;
 using NUnit.Framework;
-using OpenSim.Tests.Common.Setup;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
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/ScriptEngine/XEngine/Tests/XEngineTest.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/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs index 045abb4..b635d5c 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -29,7 +29,6 @@ using System;
29	using System.Collections.Generic;	29	using System.Collections.Generic;
30	using Nini.Config;	30	using Nini.Config;
31	using NUnit.Framework;	31	using NUnit.Framework;
32	using OpenSim.Tests.Common.Setup;
33	using OpenSim.Tests.Common.Mock;	32	using OpenSim.Tests.Common.Mock;
34	using OpenSim.Region.Framework.Scenes;	33	using OpenSim.Region.Framework.Scenes;
35	using OpenMetaverse;	34	using OpenMetaverse;