Merge branch 'master' into bulletsim

author: Dan Lake 2011-07-11 12:23:20 -0700
committer: Dan Lake 2011-07-11 12:23:20 -0700
commit: b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree: 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
parent: Checkin 32 bit bulletsim shared library for Linux. (diff)
parent: minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download: opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 5357a06..1b8c100 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            IConfig config = configSource.AddConfig("Startup");
            config.Set("serverside_object_permissions", true);
            SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
-            TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId);
+            TestClient client = SceneSetupHelpers.AddClient(scene, userId);
            
            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
            IConfig config = configSource.AddConfig("Startup");
            config.Set("serverside_object_permissions", true);
            SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });            
-            TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId);
+            TestClient client = SceneSetupHelpers.AddClient(scene, userId);
            
            // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
            AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
author	Dan Lake	2011-07-11 12:23:20 -0700
committer	Dan Lake	2011-07-11 12:23:20 -0700
commit	b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree	8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
parent	Checkin 32 bit bulletsim shared library for Linux. (diff)
parent	minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download	opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 5357a06..1b8c100 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
66	IConfig config = configSource.AddConfig("Startup");	66	IConfig config = configSource.AddConfig("Startup");
67	config.Set("serverside_object_permissions", true);	67	config.Set("serverside_object_permissions", true);
68	SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });	68	SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
69	TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId);	69	TestClient client = SceneSetupHelpers.AddClient(scene, userId);
70		70
71	// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.	71	// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
72	AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;	72	AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
105	IConfig config = configSource.AddConfig("Startup");	105	IConfig config = configSource.AddConfig("Startup");
106	config.Set("serverside_object_permissions", true);	106	config.Set("serverside_object_permissions", true);
107	SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });	107	SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
108	TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId);	108	TestClient client = SceneSetupHelpers.AddClient(scene, userId);
109		109
110	// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.	110	// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
111	AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;	111	AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;