diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 92cbbc6..3f9834c 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -841,33 +841,33 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 841 | { | 841 | { |
| 842 | } | 842 | } |
| 843 | 843 | ||
| 844 | /// <summary> | 844 | // /// <summary> |
| 845 | /// TODO: | 845 | // /// TODO: |
| 846 | /// </summary> | 846 | // /// </summary> |
| 847 | /// <param name="rdata"></param> | 847 | // /// <param name="rdata"></param> |
| 848 | public void UnCombineRegion(RegionData rdata) | 848 | // public void UnCombineRegion(RegionData rdata) |
| 849 | { | 849 | // { |
| 850 | lock (m_regions) | 850 | // lock (m_regions) |
| 851 | { | 851 | // { |
| 852 | if (m_regions.ContainsKey(rdata.RegionId)) | 852 | // if (m_regions.ContainsKey(rdata.RegionId)) |
| 853 | { | 853 | // { |
| 854 | // uncombine root region and virtual regions | 854 | // // uncombine root region and virtual regions |
| 855 | } | 855 | // } |
| 856 | else | 856 | // else |
| 857 | { | 857 | // { |
| 858 | foreach (RegionConnections r in m_regions.Values) | 858 | // foreach (RegionConnections r in m_regions.Values) |
| 859 | { | 859 | // { |
| 860 | foreach (RegionData rd in r.ConnectedRegions) | 860 | // foreach (RegionData rd in r.ConnectedRegions) |
| 861 | { | 861 | // { |
| 862 | if (rd.RegionId == rdata.RegionId) | 862 | // if (rd.RegionId == rdata.RegionId) |
| 863 | { | 863 | // { |
| 864 | // uncombine virtual region | 864 | // // uncombine virtual region |
| 865 | } | 865 | // } |
| 866 | } | 866 | // } |
| 867 | } | 867 | // } |
| 868 | } | 868 | // } |
| 869 | } | 869 | // } |
| 870 | } | 870 | // } |
| 871 | 871 | ||
| 872 | // Create a set of infinite borders around the whole aabb of the combined island. | 872 | // Create a set of infinite borders around the whole aabb of the combined island. |
| 873 | private void AdjustLargeRegionBounds() | 873 | private void AdjustLargeRegionBounds() |