Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2012-04-27 09:26:14 -0700
committer: Diva Canto 2012-04-27 09:26:14 -0700
commit: 2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch)
tree: e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
parent: Minor change in error message (HG teleport failures) (diff)
parent: Add regression test for teleporting an agent between separated regions on the... (diff)
download: opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2
opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index a575e36..1321470 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            TestHelpers.InMethod();
 //            XmlConfigurator.Configure();
-            TestScene scene = SceneHelpers.SetupScene();
+            TestScene scene = new SceneHelpers().SetupScene();
            uint myCircuitCode = 123456;
            UUID myAgentUuid   = TestHelpers.ParseTail(0x1);
            UUID mySessionUuid = TestHelpers.ParseTail(0x2);
author	Diva Canto	2012-04-27 09:26:14 -0700
committer	Diva Canto	2012-04-27 09:26:14 -0700
commit	2970a18e54bc4811af67a2f0c307fb79c00c9a18 (patch)
tree	e4faab8dd2b55edff0632faf241c960ad553ccbc /OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
parent	Minor change in error message (HG teleport failures) (diff)
parent	Add regression test for teleporting an agent between separated regions on the... (diff)
download	opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.zip opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.gz opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.bz2 opensim-SC_OLD-2970a18e54bc4811af67a2f0c307fb79c00c9a18.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs index a575e36..1321470 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
158	TestHelpers.InMethod();	158	TestHelpers.InMethod();
159	// XmlConfigurator.Configure();	159	// XmlConfigurator.Configure();
160		160
161	TestScene scene = SceneHelpers.SetupScene();	161	TestScene scene = new SceneHelpers().SetupScene();
162	uint myCircuitCode = 123456;	162	uint myCircuitCode = 123456;
163	UUID myAgentUuid = TestHelpers.ParseTail(0x1);	163	UUID myAgentUuid = TestHelpers.ParseTail(0x1);
164	UUID mySessionUuid = TestHelpers.ParseTail(0x2);	164	UUID mySessionUuid = TestHelpers.ParseTail(0x2);