First test passes -- regions being registered and retrieved correctly in Data.Null.

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
             GridRegion r2 = new GridRegion();
             r2.RegionName = "Test Region 2";
             r2.RegionID = new UUID(2);
-            r2.RegionLocX = 1000 * (int)Constants.RegionSize + 1;
+            r2.RegionLocX = 1001 * (int)Constants.RegionSize;
             r2.RegionLocY = 1000 * (int)Constants.RegionSize;
             r2.ExternalHostName = "127.0.0.1";
             r2.HttpPort = 9002;
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
             GridRegion r3 = new GridRegion();
             r3.RegionName = "Test Region 3";
             r3.RegionID = new UUID(3);
-            r3.RegionLocX = 1000 * (int)Constants.RegionSize + 5;
+            r3.RegionLocX = 1005 * (int)Constants.RegionSize;
             r3.RegionLocY = 1000 * (int)Constants.RegionSize;
             r3.ExternalHostName = "127.0.0.1";
             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
                     region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID);
 
                 foreach (RegionData rdata in rdatas)
-                    rinfos.Add(RegionData2RegionInfo(rdata));
+                    if (rdata.RegionID != regionID)
+                        rinfos.Add(RegionData2RegionInfo(rdata));
 
             }
             return rinfos;