ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

HG LinkRegion receive region size also. Useless since olde r gatekeepers dont send it

Browse Source
This commit is contained in:
UbitUmarov
2016-11-20 04:22:00 +00:00
parent e2b580e569
commit 4c2ece3bcb
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Services/GridService/HypergridLinker.cs
View File

@@ -198,7 +198,7 @@ namespace OpenSim.Services.GridService
mapName = mapName.Trim();
if (!mapName.StartsWith("http"))
if (!mapName.StartsWith("http") && !!mapName.StartsWith("https"))
{
// Formats: grid.example.com:8002:region name
// grid.example.com:region name
@@ -365,7 +365,9 @@ namespace OpenSim.Services.GridService
UUID regionID = UUID.Zero;
string externalName = string.Empty;
string imageURL = string.Empty;
if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason))
int sizeX = (int)Constants.RegionSize;
int sizeY = (int)Constants.RegionSize;
if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason, out sizeX, out sizeY))
return false;
if (regionID == UUID.Zero)
@@ -397,6 +399,8 @@ namespace OpenSim.Services.GridService
// }
regInfo.RegionID = regionID;
regInfo.RegionSizeX = sizeX;
regInfo.RegionSizeY = sizeY;
if (externalName == string.Empty)
regInfo.RegionName = regInfo.ServerURI;