diff options
| author | Diva Canto | 2009-09-26 07:49:04 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-26 07:49:04 -0700 |
| commit | 7253a9453e25560396e4f8c25402012b840ed0c4 (patch) | |
| tree | 0291b369787f1dd136e75b1eedf752bfa19686cc /OpenSim/Region/CoreModules/World/Land | |
| parent | First pass at the heart surgery for grid services. Compiles and runs minimall... (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.zip opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.tar.gz opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.tar.bz2 opensim-SC_OLD-7253a9453e25560396e4f8c25402012b840ed0c4.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 1436912..181c5ae 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | |||
| @@ -79,12 +79,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 79 | { | 79 | { |
| 80 | if (!enabledYN) | 80 | if (!enabledYN) |
| 81 | return; | 81 | return; |
| 82 | 82 | /* | |
| 83 | // For testing on a single instance | 83 | // For testing on a single instance |
| 84 | if (scene.RegionInfo.RegionLocX == 1004 && scene.RegionInfo.RegionLocY == 1000) | 84 | if (scene.RegionInfo.RegionLocX == 1004 && scene.RegionInfo.RegionLocY == 1000) |
| 85 | return; | 85 | return; |
| 86 | // | 86 | // |
| 87 | 87 | */ | |
| 88 | lock (m_startingScenes) | 88 | lock (m_startingScenes) |
| 89 | m_startingScenes.Add(scene.RegionInfo.originRegionID, scene); | 89 | m_startingScenes.Add(scene.RegionInfo.originRegionID, scene); |
| 90 | 90 | ||