diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index f28faed..4e7c76f 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -437,8 +437,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
437 | } | 437 | } |
438 | } | 438 | } |
439 | 439 | ||
440 | /// <summary> | ||
441 | /// Like handleEventManagerOnSignificantClientMovement, but called with an AgentUpdate regardless of distance. | ||
442 | /// </summary> | ||
443 | /// <param name="avatar"></param> | ||
440 | public void EventManagerOnClientMovement(ScenePresence avatar) | 444 | public void EventManagerOnClientMovement(ScenePresence avatar) |
441 | //Like handleEventManagerOnSignificantClientMovement, but called with an AgentUpdate regardless of distance. | 445 | // |
442 | { | 446 | { |
443 | ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 447 | ILandObject over = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
444 | if (over != null) | 448 | if (over != null) |
@@ -451,7 +455,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
451 | } | 455 | } |
452 | } | 456 | } |
453 | 457 | ||
454 | |||
455 | public void ClientOnParcelAccessListRequest(UUID agentID, UUID sessionID, uint flags, int sequenceID, | 458 | public void ClientOnParcelAccessListRequest(UUID agentID, UUID sessionID, uint flags, int sequenceID, |
456 | int landLocalID, IClientAPI remote_client) | 459 | int landLocalID, IClientAPI remote_client) |
457 | { | 460 | { |
@@ -585,14 +588,14 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
585 | //m_scene.SimulationDataService.RemoveLandObject(lo.LandData.GlobalID); | 588 | //m_scene.SimulationDataService.RemoveLandObject(lo.LandData.GlobalID); |
586 | m_scene.EventManager.TriggerLandObjectRemoved(lo.LandData.GlobalID); | 589 | m_scene.EventManager.TriggerLandObjectRemoved(lo.LandData.GlobalID); |
587 | } | 590 | } |
588 | 591 | ||
589 | m_landList.Clear(); | 592 | m_landList.Clear(); |
593 | |||
594 | ResetSimLandObjects(); | ||
595 | |||
596 | if (setupDefaultParcel) | ||
597 | CreateDefaultParcel(); | ||
590 | } | 598 | } |
591 | |||
592 | ResetSimLandObjects(); | ||
593 | |||
594 | if (setupDefaultParcel) | ||
595 | CreateDefaultParcel(); | ||
596 | } | 599 | } |
597 | 600 | ||
598 | private void performFinalLandJoin(ILandObject master, ILandObject slave) | 601 | private void performFinalLandJoin(ILandObject master, ILandObject slave) |
@@ -1324,8 +1327,11 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1324 | 1327 | ||
1325 | public void EventManagerOnNoLandDataFromStorage() | 1328 | public void EventManagerOnNoLandDataFromStorage() |
1326 | { | 1329 | { |
1327 | ResetSimLandObjects(); | 1330 | lock (m_landList) |
1328 | CreateDefaultParcel(); | 1331 | { |
1332 | ResetSimLandObjects(); | ||
1333 | CreateDefaultParcel(); | ||
1334 | } | ||
1329 | } | 1335 | } |
1330 | 1336 | ||
1331 | #endregion | 1337 | #endregion |