Merge branch 'master' into bulletsim

Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
author: Mic Bowman 2011-08-19 14:49:16 -0700
committer: Mic Bowman 2011-08-19 14:49:16 -0700
commit: 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch)
tree: 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
parent: BulletSim: add runtime setting of physics parameters. Update default values. (diff)
parent: Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff)
download: opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip
opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz
opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2
opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index 895f2bb..9a60e50 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -43,8 +43,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
        [Test]
        public void TestDuplicateObject()
        {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
-            Scene scene = SceneSetupHelpers.SetupScene();
+            Scene scene = SceneHelpers.SetupScene();
            UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010");
            string part1Name = "part1";
author	Mic Bowman	2011-08-19 14:49:16 -0700
committer	Mic Bowman	2011-08-19 14:49:16 -0700
commit	384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch)
tree	5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
parent	BulletSim: add runtime setting of physics parameters. Update default values. (diff)
parent	Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff)
download	opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs index 895f2bb..9a60e50 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -43,8 +43,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
43	[Test]	43	[Test]
44	public void TestDuplicateObject()	44	public void TestDuplicateObject()
45	{	45	{
46	TestHelper.InMethod();	46	TestHelpers.InMethod();
47	Scene scene = SceneSetupHelpers.SetupScene();	47	Scene scene = SceneHelpers.SetupScene();
48		48
49	UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010");	49	UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010");
50	string part1Name = "part1";	50	string part1Name = "part1";