diff options
| author | Melanie | 2013-01-11 02:13:10 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-11 02:13:10 +0000 |
| commit | f74915ed4f8831344ee588d9036b7ac866ea4294 (patch) | |
| tree | 5f1021165cf4acc9043b3015c2aac468128fa1dc /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix a regression in the last few scene commands changes where setting these v... (diff) | |
| download | opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.zip opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.gz opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.bz2 opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
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 9aee491..a5f5749 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -780,13 +780,18 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 780 | Scene.RegionInfo.RegionSettings.Save(); | 780 | Scene.RegionInfo.RegionSettings.Save(); |
| 781 | TriggerRegionInfoChange(); | 781 | TriggerRegionInfoChange(); |
| 782 | 782 | ||
| 783 | Scene.SetSceneCoreDebug( | 783 | ISceneCommandsModule scm = Scene.RequestModuleInterface<ISceneCommandsModule>(); |
| 784 | new Dictionary<string, string>() { | 784 | |
| 785 | { "scripting", (!disableScripts).ToString() }, | 785 | if (scm != null) |
| 786 | { "collisions", (!disableCollisions).ToString() }, | 786 | { |
| 787 | { "physics", (!disablePhysics).ToString() } | 787 | scm.SetSceneDebugOptions( |
| 788 | } | 788 | new Dictionary<string, string>() { |
| 789 | ); | 789 | { "scripting", (!disableScripts).ToString() }, |
| 790 | { "collisions", (!disableCollisions).ToString() }, | ||
| 791 | { "physics", (!disablePhysics).ToString() } | ||
| 792 | } | ||
| 793 | ); | ||
| 794 | } | ||
| 790 | } | 795 | } |
| 791 | 796 | ||
| 792 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) | 797 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) |