diff options
author | Teravus Ovares (Dan Olivares) | 2009-09-02 04:39:00 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-09-02 04:39:00 -0400 |
commit | 9505297fb109e800be5733066f05f53d97eafe84 (patch) | |
tree | 45d659121e21932434310499c2ccf2690231793d /OpenSim/Region/CoreModules/World | |
parent | Prevent the Viewer's threaded inventory retrieval causing a OOM and overload (diff) | |
download | opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.zip opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.gz opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.bz2 opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.xz |
* One last attempt to get the bordercrossing/primcrossing/attachmentcrossing right in the new border framework.
* This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 035e6f8..6a5317b 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 | { |