Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index ea433a6..c64270f 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Tests.Common
             IConfigSource configSource = new IniConfigSource();
 
             TestScene testScene = new TestScene(
-                regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null);
+                regInfo, acm, scs, simDataService, estateDataService, null, false, false, configSource, null);
 
             IRegionModule godsModule = new GodsModule();
             godsModule.Initialise(testScene, new IniConfigSource());