diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Land')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index 68aee86..0c4e6db 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs | |||
@@ -556,7 +556,12 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
556 | } | 556 | } |
557 | lock (m_landList) | 557 | lock (m_landList) |
558 | { | 558 | { |
559 | return m_landList[m_landIDList[x, y]]; | 559 | // Corner case. If an autoreturn happens during sim startup |
560 | // we will come here with the list uninitialized | ||
561 | // | ||
562 | if (m_landList.ContainsKey(m_landIDList[x, y])) | ||
563 | return m_landList[m_landIDList[x, y]]; | ||
564 | return null; | ||
560 | } | 565 | } |
561 | } | 566 | } |
562 | 567 | ||