OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

remotes/origin/0.6.7-post-fixes
Diva Canto 2009-09-23 20:39:25 -07:00
parent 3c19bd5142
commit fd8fb7735b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
View File

@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
GridRegion r2 = new GridRegion(); GridRegion r2 = new GridRegion();
r2.RegionName = "Test Region 2"; r2.RegionName = "Test Region 2";
r2.RegionID = new UUID(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.RegionLocY = 1000 * (int)Constants.RegionSize;
r2.ExternalHostName = "127.0.0.1"; r2.ExternalHostName = "127.0.0.1";
r2.HttpPort = 9002; r2.HttpPort = 9002;
@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
GridRegion r3 = new GridRegion(); GridRegion r3 = new GridRegion();
r3.RegionName = "Test Region 3"; r3.RegionName = "Test Region 3";
r3.RegionID = new UUID(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.RegionLocY = 1000 * (int)Constants.RegionSize;
r3.ExternalHostName = "127.0.0.1"; r3.ExternalHostName = "127.0.0.1";
r3.HttpPort = 9003; r3.HttpPort = 9003;

3
OpenSim/Services/GridService/GridService.cs
View File

@ -101,7 +101,8 @@ namespace OpenSim.Services.GridService
region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID); region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID);
foreach (RegionData rdata in rdatas) foreach (RegionData rdata in rdatas)
rinfos.Add(RegionData2RegionInfo(rdata)); if (rdata.RegionID != regionID)
rinfos.Add(RegionData2RegionInfo(rdata));
} }
return rinfos; return rinfos;