diff options
| author | Diva Canto | 2012-03-20 17:33:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-20 17:33:26 -0700 |
| commit | 69a9a6993e3e4135fcd925e4e382a0998ec261b8 (patch) | |
| tree | 0496f37b887ed7ce2ee76a54fe562df465dfcbf0 | |
| parent | Fixed borkness with map search introduce by my last changes to it. (diff) | |
| parent | fix compile error from last commit (diff) | |
| download | opensim-SC_OLD-69a9a6993e3e4135fcd925e4e382a0998ec261b8.zip opensim-SC_OLD-69a9a6993e3e4135fcd925e4e382a0998ec261b8.tar.gz opensim-SC_OLD-69a9a6993e3e4135fcd925e4e382a0998ec261b8.tar.bz2 opensim-SC_OLD-69a9a6993e3e4135fcd925e4e382a0998ec261b8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -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 2a7338f..1adeb88 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
| @@ -670,7 +670,7 @@ 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(scriptsOn, collisionsOn, physicsOn); | 673 | Scene.SetSceneCoreDebug(disableScripts, disableCollisions, disablePhysics); |
| 674 | } | 674 | } |
| 675 | 675 | ||
| 676 | 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) |