diff options
author | Diva Canto | 2012-03-20 17:26:18 -0700 |
---|---|---|
committer | Diva Canto | 2012-03-20 17:26:18 -0700 |
commit | 742acc0a3c6e5023633f81c616348736c028d80d (patch) | |
tree | 50bb5c67da1dfb047aae5b98b34d4336396989ba | |
parent | Fixed borkness with previous merge. (diff) | |
parent | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest() (diff) | |
download | opensim-SC_OLD-742acc0a3c6e5023633f81c616348736c028d80d.zip opensim-SC_OLD-742acc0a3c6e5023633f81c616348736c028d80d.tar.gz opensim-SC_OLD-742acc0a3c6e5023633f81c616348736c028d80d.tar.bz2 opensim-SC_OLD-742acc0a3c6e5023633f81c616348736c028d80d.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 25 |
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 4c6f73e..2a7338f 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -660,28 +660,17 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
660 | TriggerEstateMessage(senderID, senderName, message); | 660 | TriggerEstateMessage(senderID, senderName, message); |
661 | } | 661 | } |
662 | 662 | ||
663 | private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) | 663 | private void handleEstateDebugRegionRequest( |
664 | IClientAPI remote_client, UUID invoice, UUID senderID, | ||
665 | bool disableScripts, bool disableCollisions, bool disablePhysics) | ||
664 | { | 666 | { |
665 | if (physics) | 667 | Scene.RegionInfo.RegionSettings.DisablePhysics = disablePhysics; |
666 | Scene.RegionInfo.RegionSettings.DisablePhysics = true; | 668 | Scene.RegionInfo.RegionSettings.DisableScripts = disableScripts; |
667 | else | 669 | Scene.RegionInfo.RegionSettings.DisableCollisions = disableCollisions; |
668 | Scene.RegionInfo.RegionSettings.DisablePhysics = false; | ||
669 | |||
670 | if (scripted) | ||
671 | Scene.RegionInfo.RegionSettings.DisableScripts = true; | ||
672 | else | ||
673 | Scene.RegionInfo.RegionSettings.DisableScripts = false; | ||
674 | |||
675 | if (collisionEvents) | ||
676 | Scene.RegionInfo.RegionSettings.DisableCollisions = true; | ||
677 | else | ||
678 | Scene.RegionInfo.RegionSettings.DisableCollisions = false; | ||
679 | |||
680 | |||
681 | Scene.RegionInfo.RegionSettings.Save(); | 670 | Scene.RegionInfo.RegionSettings.Save(); |
682 | TriggerRegionInfoChange(); | 671 | TriggerRegionInfoChange(); |
683 | 672 | ||
684 | Scene.SetSceneCoreDebug(scripted, collisionEvents, physics); | 673 | Scene.SetSceneCoreDebug(scriptsOn, collisionsOn, physicsOn); |
685 | } | 674 | } |
686 | 675 | ||
687 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) | 676 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) |