Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
author: Melanie 2012-11-25 14:13:50 +0000
committer: Melanie 2012-11-25 14:13:50 +0000
commit: fd7a83f439132062d500471830eb26e7183d30bc (patch)
tree: db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
parent: Merge branch 'careminster' into avination (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.zip
opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz
opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2
opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
index 1d1ff88..d80afd3 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
@@ -42,7 +42,7 @@ using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
    [TestFixture]
-    public class ScenePresenceAutopilotTests
+    public class ScenePresenceAutopilotTests : OpenSimTestCase
    {
        private TestScene m_scene;
author	Melanie	2012-11-25 14:13:50 +0000
committer	Melanie	2012-11-25 14:13:50 +0000
commit	fd7a83f439132062d500471830eb26e7183d30bc (patch)
tree	db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
parent	Merge branch 'careminster' into avination (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs index 1d1ff88..d80afd3 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs
@@ -42,7 +42,7 @@ using OpenSim.Tests.Common.Mock;
42	namespace OpenSim.Region.Framework.Scenes.Tests	42	namespace OpenSim.Region.Framework.Scenes.Tests
43	{	43	{
44	[TestFixture]	44	[TestFixture]
45	public class ScenePresenceAutopilotTests	45	public class ScenePresenceAutopilotTests : OpenSimTestCase
46	{	46	{
47	private TestScene m_scene;	47	private TestScene m_scene;
48		48