1 files changed, 12 insertions, 7 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index eb06fcc..311707b 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -753,13 +753,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
             Scene.RegionInfo.RegionSettings.Save();
             TriggerRegionInfoChange();
 
-            Scene.SetSceneCoreDebug(
-                new Dictionary<string, string>() {
-                    { "scripting", (!disableScripts).ToString() },
-                    { "collisions", (!disableCollisions).ToString() },
-                    { "physics", (!disablePhysics).ToString() }
-                }
-            );
+            ISceneCommandsModule scm = Scene.RequestModuleInterface<ISceneCommandsModule>();
+
+            if (scm != null)
+            {
+                scm.SetSceneDebugOptions(
+                    new Dictionary<string, string>() {
+                        { "scripting", (!disableScripts).ToString() },
+                        { "collisions", (!disableCollisions).ToString() },
+                        { "physics", (!disablePhysics).ToString() }
+                    }
+                );
+            }
         }
 
         private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey)