diff options
| author | Melanie | 2012-03-21 00:09:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-21 00:09:18 +0000 |
| commit | d3a5cdd7c208257bf4a3944fbe67aae5045d561a (patch) | |
| tree | 15e6c2428e18aced4bd80e80407d579810a6ace0 | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | fix compile error from last commit (diff) | |
| download | opensim-SC-d3a5cdd7c208257bf4a3944fbe67aae5045d561a.zip opensim-SC-d3a5cdd7c208257bf4a3944fbe67aae5045d561a.tar.gz opensim-SC-d3a5cdd7c208257bf4a3944fbe67aae5045d561a.tar.bz2 opensim-SC-d3a5cdd7c208257bf4a3944fbe67aae5045d561a.tar.xz | |
Merge branch 'master' into careminster
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 367fc72..8b13b01 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -691,7 +691,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
| 691 | Scene.RegionInfo.RegionSettings.Save(); | 691 | Scene.RegionInfo.RegionSettings.Save(); |
| 692 | TriggerRegionInfoChange(); | 692 | TriggerRegionInfoChange(); |
| 693 | 693 | ||
| 694 | Scene.SetSceneCoreDebug(scriptsOn, collisionsOn, physicsOn); | 694 | Scene.SetSceneCoreDebug(disableScripts, disableCollisions, disablePhysics); |
| 695 | } | 695 | } |
| 696 | 696 | ||
| 697 | 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) |