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/SceneObjectLinkingTests.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/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 0e525c9..9378e20 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -40,7 +40,7 @@ using log4net;
 namespace OpenSim.Region.Framework.Scenes.Tests
 {
    [TestFixture]
-    public class SceneObjectLinkingTests
+    public class SceneObjectLinkingTests : OpenSimTestCase
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
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/SceneObjectLinkingTests.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/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index 0e525c9..9378e20 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -40,7 +40,7 @@ using log4net;
40	namespace OpenSim.Region.Framework.Scenes.Tests	40	namespace OpenSim.Region.Framework.Scenes.Tests
41	{	41	{
42	[TestFixture]	42	[TestFixture]
43	public class SceneObjectLinkingTests	43	public class SceneObjectLinkingTests : OpenSimTestCase
44	{	44	{
45	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	45	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46		46