diff options
| author | Diva Canto | 2012-03-20 21:36:46 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-20 21:36:46 -0700 |
| commit | 5abe1b4fceed20af8a4330c248aad0d81f9c95ce (patch) | |
| tree | fe7c729ae8b3b579f0bb647d30574204e8893db3 /OpenSim/Region/CoreModules | |
| parent | HG Friends config for Robust.HG.ini.example (diff) | |
| parent | If "debug scene updates true" then print out to log when a garbage collection... (diff) | |
| download | opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.zip opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.tar.gz opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.tar.bz2 opensim-SC_OLD-5abe1b4fceed20af8a4330c248aad0d81f9c95ce.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 1adeb88..fc217b0 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -670,7 +670,13 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 670 | Scene.RegionInfo.RegionSettings.Save(); | 670 | Scene.RegionInfo.RegionSettings.Save(); |
| 671 | TriggerRegionInfoChange(); | 671 | TriggerRegionInfoChange(); |
| 672 | 672 | ||
| 673 | Scene.SetSceneCoreDebug(disableScripts, disableCollisions, disablePhysics); | 673 | Scene.SetSceneCoreDebug( |
| 674 | new Dictionary<string, string>() { | ||
| 675 | { "scripting", (!disableScripts).ToString() }, | ||
| 676 | { "collisions", (!disableCollisions).ToString() }, | ||
| 677 | { "physics", (!disablePhysics).ToString() } | ||
| 678 | } | ||
| 679 | ); | ||
| 674 | } | 680 | } |
| 675 | 681 | ||
| 676 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) | 682 | private void handleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey) |