From 21b1fec32d33ac00677e25ca00463a76794e1a62 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 27 Jul 2012 00:28:23 +0100
Subject: 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(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 204c4ff..3144d76 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -99,6 +99,8 @@ namespace OpenSim.Region.RegionCombinerModule
 
         public void RemoveRegion(Scene scene)
         {
+            lock (m_startingScenes)
+                m_startingScenes.Remove(scene.RegionInfo.originRegionID);
         }
 
         public void RegionLoaded(Scene scene)
-- 
cgit v1.1