diff options
| author | ubit | 2012-08-02 18:21:08 +0200 |
|---|---|---|
| committer | ubit | 2012-08-02 18:21:08 +0200 |
| commit | 254d3e1ad31f99770074abb49fec03c90d99b246 (patch) | |
| tree | fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |
| parent | i local libs commit (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.zip opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2 opensim-SC_OLD-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz | |
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 2 |
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) |