aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-27 00:28:23 +0100
committerJustin Clark-Casey (justincc)2012-07-27 00:28:23 +0100
commit21b1fec32d33ac00677e25ca00463a76794e1a62 (patch)
tree03adca5889a3dd497ef0f14cc8a7b3bbdeb1dc1d /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-21b1fec32d33ac00677e25ca00463a76794e1a62.zip
opensim-SC_OLD-21b1fec32d33ac00677e25ca00463a76794e1a62.tar.gz
opensim-SC_OLD-21b1fec32d33ac00677e25ca00463a76794e1a62.tar.bz2
opensim-SC_OLD-21b1fec32d33ac00677e25ca00463a76794e1a62.tar.xz
Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs2
1 files changed, 2 insertions, 0 deletions
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
99 99
100 public void RemoveRegion(Scene scene) 100 public void RemoveRegion(Scene scene)
101 { 101 {
102 lock (m_startingScenes)
103 m_startingScenes.Remove(scene.RegionInfo.originRegionID);
102 } 104 }
103 105
104 public void RegionLoaded(Scene scene) 106 public void RegionLoaded(Scene scene)