diff options
| author | Justin Clark-Casey (justincc) | 2013-01-10 23:49:48 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-10 23:49:48 +0000 |
| commit | a16ae5d7e3e687fdcdae39f848f66087f16433a2 (patch) | |
| tree | fe0c7fe3aaff713bdce71f1ba2a86c1a9170f291 /OpenSim/Region/CoreModules | |
| parent | refactor: route the final scene backup through the same code that handles per... (diff) | |
| download | opensim-SC_OLD-a16ae5d7e3e687fdcdae39f848f66087f16433a2.zip opensim-SC_OLD-a16ae5d7e3e687fdcdae39f848f66087f16433a2.tar.gz opensim-SC_OLD-a16ae5d7e3e687fdcdae39f848f66087f16433a2.tar.bz2 opensim-SC_OLD-a16ae5d7e3e687fdcdae39f848f66087f16433a2.tar.xz | |
Move scene debug commands into separate module. Command changes from "debug scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 19 |
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 d05abc5..60f6739 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 | |||
| 753 | Scene.RegionInfo.RegionSettings.Save(); | 753 | Scene.RegionInfo.RegionSettings.Save(); |
| 754 | TriggerRegionInfoChange(); | 754 | TriggerRegionInfoChange(); |
| 755 | 755 | ||
| 756 | Scene.SetSceneCoreDebug( | 756 | ISceneCommandsModule scm = Scene.RequestModuleInterface<ISceneCommandsModule>(); |
| 757 | new Dictionary<string, string>() { | 757 | |
| 758 | { "scripting", (!disableScripts).ToString() }, | 758 | if (scm != null) |
| 759 | { "collisions", (!disableCollisions).ToString() }, | 759 | { |
| 760 | { "physics", (!disablePhysics).ToString() } | 760 | scm.SetSceneDebugOptions( |
| 761 | } | 761 | new Dictionary<string, string>() { |
| 762 | ); | 762 | { "scripting", (!disableScripts).ToString() }, |
| 763 | { "collisions", (!disableCollisions).ToString() }, | ||
| 764 | { "physics", (!disablePhysics).ToString() } | ||
| 765 | } | ||
| 766 | ); | ||
| 767 | } | ||
| 763 | } | 768 | } |
| 764 | 769 | ||
| 765 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) | 770 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) |