diff options
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 035e6f8..c525227 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | |||
@@ -495,6 +495,29 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
495 | 495 | ||
496 | } | 496 | } |
497 | 497 | ||
498 | public void UnCombineRegion(RegionData rdata) | ||
499 | { | ||
500 | lock (m_regions) | ||
501 | { | ||
502 | if (m_regions.ContainsKey(rdata.RegionId)) | ||
503 | { | ||
504 | // uncombine root region and virtual regions | ||
505 | } | ||
506 | else | ||
507 | { | ||
508 | foreach (RegionConnections r in m_regions.Values) | ||
509 | { | ||
510 | foreach (RegionData rd in r.ConnectedRegions) | ||
511 | { | ||
512 | if (rd.RegionId == rdata.RegionId) | ||
513 | { | ||
514 | // uncombine virtual region | ||
515 | } | ||
516 | } | ||
517 | } | ||
518 | } | ||
519 | } | ||
520 | } | ||
498 | // Create a set of infinite borders around the whole aabb of the combined island. | 521 | // Create a set of infinite borders around the whole aabb of the combined island. |
499 | private void AdjustLargeRegionBounds() | 522 | private void AdjustLargeRegionBounds() |
500 | { | 523 | { |
@@ -635,8 +658,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
635 | 658 | ||
636 | public class LargeLandChannel : ILandChannel | 659 | public class LargeLandChannel : ILandChannel |
637 | { | 660 | { |
638 | private static readonly ILog m_log = | 661 | // private static readonly ILog m_log = |
639 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 662 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
640 | private RegionData RegData; | 663 | private RegionData RegData; |
641 | private ILandChannel RootRegionLandChannel; | 664 | private ILandChannel RootRegionLandChannel; |
642 | private readonly List<RegionData> RegionConnections; | 665 | private readonly List<RegionData> RegionConnections; |