aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs4
-rw-r--r--OpenSim/Services/GridService/GridService.cs3
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 8d44249..bd3293d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
82 GridRegion r2 = new GridRegion(); 82 GridRegion r2 = new GridRegion();
83 r2.RegionName = "Test Region 2"; 83 r2.RegionName = "Test Region 2";
84 r2.RegionID = new UUID(2); 84 r2.RegionID = new UUID(2);
85 r2.RegionLocX = 1000 * (int)Constants.RegionSize + 1; 85 r2.RegionLocX = 1001 * (int)Constants.RegionSize;
86 r2.RegionLocY = 1000 * (int)Constants.RegionSize; 86 r2.RegionLocY = 1000 * (int)Constants.RegionSize;
87 r2.ExternalHostName = "127.0.0.1"; 87 r2.ExternalHostName = "127.0.0.1";
88 r2.HttpPort = 9002; 88 r2.HttpPort = 9002;
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
91 GridRegion r3 = new GridRegion(); 91 GridRegion r3 = new GridRegion();
92 r3.RegionName = "Test Region 3"; 92 r3.RegionName = "Test Region 3";
93 r3.RegionID = new UUID(3); 93 r3.RegionID = new UUID(3);
94 r3.RegionLocX = 1000 * (int)Constants.RegionSize + 5; 94 r3.RegionLocX = 1005 * (int)Constants.RegionSize;
95 r3.RegionLocY = 1000 * (int)Constants.RegionSize; 95 r3.RegionLocY = 1000 * (int)Constants.RegionSize;
96 r3.ExternalHostName = "127.0.0.1"; 96 r3.ExternalHostName = "127.0.0.1";
97 r3.HttpPort = 9003; 97 r3.HttpPort = 9003;
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index cd462ab..1b297dc 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -101,7 +101,8 @@ namespace OpenSim.Services.GridService
101 region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID); 101 region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID);
102 102
103 foreach (RegionData rdata in rdatas) 103 foreach (RegionData rdata in rdatas)
104 rinfos.Add(RegionData2RegionInfo(rdata)); 104 if (rdata.RegionID != regionID)
105 rinfos.Add(RegionData2RegionInfo(rdata));
105 106
106 } 107 }
107 return rinfos; 108 return rinfos;