diff options
author | Oren Hurvitz | 2011-05-12 14:42:28 +0300 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-14 00:41:32 +0100 |
commit | 64d868fb64329b1c961dc8f520c71789bc146609 (patch) | |
tree | 603b781ed601f3cb872d331b9224a7cbe9beca8d /OpenSim/Region/CoreModules/World/Land | |
parent | The get_grid_info REST call now encodes XML Entities (diff) | |
download | opensim-SC_OLD-64d868fb64329b1c961dc8f520c71789bc146609.zip opensim-SC_OLD-64d868fb64329b1c961dc8f520c71789bc146609.tar.gz opensim-SC_OLD-64d868fb64329b1c961dc8f520c71789bc146609.tar.bz2 opensim-SC_OLD-64d868fb64329b1c961dc8f520c71789bc146609.tar.xz |
When loading an OAR that doesn't have parcels, create a default parcel
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index bfab7b8..2eac79d 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -668,14 +668,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
668 | //m_scene.SimulationDataService.RemoveLandObject(lo.LandData.GlobalID); | 668 | //m_scene.SimulationDataService.RemoveLandObject(lo.LandData.GlobalID); |
669 | m_scene.EventManager.TriggerLandObjectRemoved(lo.LandData.GlobalID); | 669 | m_scene.EventManager.TriggerLandObjectRemoved(lo.LandData.GlobalID); |
670 | } | 670 | } |
671 | 671 | ||
672 | m_landList.Clear(); | 672 | m_landList.Clear(); |
673 | |||
674 | ResetSimLandObjects(); | ||
675 | |||
676 | if (setupDefaultParcel) | ||
677 | CreateDefaultParcel(); | ||
673 | } | 678 | } |
674 | |||
675 | ResetSimLandObjects(); | ||
676 | |||
677 | if (setupDefaultParcel) | ||
678 | CreateDefaultParcel(); | ||
679 | } | 679 | } |
680 | 680 | ||
681 | private void performFinalLandJoin(ILandObject master, ILandObject slave) | 681 | private void performFinalLandJoin(ILandObject master, ILandObject slave) |
@@ -1391,8 +1391,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1391 | 1391 | ||
1392 | public void EventManagerOnNoLandDataFromStorage() | 1392 | public void EventManagerOnNoLandDataFromStorage() |
1393 | { | 1393 | { |
1394 | ResetSimLandObjects(); | 1394 | lock (m_landList) |
1395 | CreateDefaultParcel(); | 1395 | { |
1396 | ResetSimLandObjects(); | ||
1397 | CreateDefaultParcel(); | ||
1398 | } | ||
1396 | } | 1399 | } |
1397 | 1400 | ||
1398 | #endregion | 1401 | #endregion |