diff options
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index 1413535..e4a3ba0 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -759,33 +759,33 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 759 | { | 759 | { |
| 760 | } | 760 | } |
| 761 | 761 | ||
| 762 | /// <summary> | 762 | // /// <summary> |
| 763 | /// TODO: | 763 | // /// TODO: |
| 764 | /// </summary> | 764 | // /// </summary> |
| 765 | /// <param name="rdata"></param> | 765 | // /// <param name="rdata"></param> |
| 766 | public void UnCombineRegion(RegionData rdata) | 766 | // public void UnCombineRegion(RegionData rdata) |
| 767 | { | 767 | // { |
| 768 | lock (m_regions) | 768 | // lock (m_regions) |
| 769 | { | 769 | // { |
| 770 | if (m_regions.ContainsKey(rdata.RegionId)) | 770 | // if (m_regions.ContainsKey(rdata.RegionId)) |
| 771 | { | 771 | // { |
| 772 | // uncombine root region and virtual regions | 772 | // // uncombine root region and virtual regions |
| 773 | } | 773 | // } |
| 774 | else | 774 | // else |
| 775 | { | 775 | // { |
| 776 | foreach (RegionConnections r in m_regions.Values) | 776 | // foreach (RegionConnections r in m_regions.Values) |
| 777 | { | 777 | // { |
| 778 | foreach (RegionData rd in r.ConnectedRegions) | 778 | // foreach (RegionData rd in r.ConnectedRegions) |
| 779 | { | 779 | // { |
| 780 | if (rd.RegionId == rdata.RegionId) | 780 | // if (rd.RegionId == rdata.RegionId) |
| 781 | { | 781 | // { |
| 782 | // uncombine virtual region | 782 | // // uncombine virtual region |
| 783 | } | 783 | // } |
| 784 | } | 784 | // } |
| 785 | } | 785 | // } |
| 786 | } | 786 | // } |
| 787 | } | 787 | // } |
| 788 | } | 788 | // } |
| 789 | 789 | ||
| 790 | // Create a set of infinite borders around the whole aabb of the combined island. | 790 | // Create a set of infinite borders around the whole aabb of the combined island. |
| 791 | private void AdjustLargeRegionBounds() | 791 | private void AdjustLargeRegionBounds() |