aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs25
1 files changed, 7 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index f4cca96..367fc72 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -681,28 +681,17 @@ namespace OpenSim.Region.CoreModules.World.Estate
681 TriggerEstateMessage(senderID, senderName, message); 681 TriggerEstateMessage(senderID, senderName, message);
682 } 682 }
683 683
684 private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) 684 private void handleEstateDebugRegionRequest(
685 IClientAPI remote_client, UUID invoice, UUID senderID,
686 bool disableScripts, bool disableCollisions, bool disablePhysics)
685 { 687 {
686 if (physics) 688 Scene.RegionInfo.RegionSettings.DisablePhysics = disablePhysics;
687 Scene.RegionInfo.RegionSettings.DisablePhysics = true; 689 Scene.RegionInfo.RegionSettings.DisableScripts = disableScripts;
688 else 690 Scene.RegionInfo.RegionSettings.DisableCollisions = disableCollisions;
689 Scene.RegionInfo.RegionSettings.DisablePhysics = false;
690
691 if (scripted)
692 Scene.RegionInfo.RegionSettings.DisableScripts = true;
693 else
694 Scene.RegionInfo.RegionSettings.DisableScripts = false;
695
696 if (collisionEvents)
697 Scene.RegionInfo.RegionSettings.DisableCollisions = true;
698 else
699 Scene.RegionInfo.RegionSettings.DisableCollisions = false;
700
701
702 Scene.RegionInfo.RegionSettings.Save(); 691 Scene.RegionInfo.RegionSettings.Save();
703 TriggerRegionInfoChange(); 692 TriggerRegionInfoChange();
704 693
705 Scene.SetSceneCoreDebug(scripted, collisionEvents, physics); 694 Scene.SetSceneCoreDebug(scriptsOn, collisionsOn, physicsOn);
706 } 695 }
707 696
708 private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) 697 private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey)