aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
diff options
context:
space:
mode:
authorMelanie2009-11-23 04:24:58 +0000
committerMelanie2009-11-23 04:24:58 +0000
commitdf121a7cd065cc067818f6a39a44ddaaab647fec (patch)
tree5cc0e157ff3aefad066c07a1ebea2ae4b1ebdbe4 /OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
parentMerge branch 'master' into careminster (diff)
parent* Adds a modicum of additional checking to the Inventory Service (MySQL only) (diff)
downloadopensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.zip
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.gz
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.bz2
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 7ec1d4b..92f060b 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -325,7 +325,7 @@ namespace OpenSim.Region.RegionCombinerModule
325 >= (regionConnections.Y * (int)Constants.RegionSize))) 325 >= (regionConnections.Y * (int)Constants.RegionSize)))
326 { 326 {
327 connectedYN = DoWorkForOneRegionOverXPlusY(conn, regionConnections, scene); 327 connectedYN = DoWorkForOneRegionOverXPlusY(conn, regionConnections, scene);
328 break; 328 break;
329 } 329 }
330 330
331 // If we're one region over +x +y 331 // If we're one region over +x +y
@@ -338,7 +338,7 @@ namespace OpenSim.Region.RegionCombinerModule
338 >= (regionConnections.Y * (int)Constants.RegionSize))) 338 >= (regionConnections.Y * (int)Constants.RegionSize)))
339 { 339 {
340 connectedYN = DoWorkForOneRegionOverPlusXPlusY(conn, regionConnections, scene); 340 connectedYN = DoWorkForOneRegionOverPlusXPlusY(conn, regionConnections, scene);
341 break; 341 break;
342 342
343 } 343 }
344 } 344 }