From aac4d9d6826705a96b98867cedb1d7cb73ded189 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 27 Jul 2012 00:28:23 +0100 Subject: [PATCH] Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded). --- OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 09da97a527..36d49faad8 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs @@ -84,6 +84,8 @@ namespace OpenSim.Region.RegionCombinerModule public void RemoveRegion(Scene scene) { + lock (m_startingScenes) + m_startingScenes.Remove(scene.RegionInfo.originRegionID); } public void RegionLoaded(Scene scene)