HG LinkRegion receive region size also. Useless since olde r gatekeepers dont send it
parent
e2b580e569
commit
4c2ece3bcb
|
@ -73,13 +73,15 @@ namespace OpenSim.Services.Connectors.Hypergrid
|
|||
return "foreignobject/";
|
||||
}
|
||||
|
||||
public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string externalName, out string imageURL, out string reason)
|
||||
public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY)
|
||||
{
|
||||
regionID = UUID.Zero;
|
||||
imageURL = string.Empty;
|
||||
realHandle = 0;
|
||||
externalName = string.Empty;
|
||||
reason = string.Empty;
|
||||
sizeX = (int)Constants.RegionSize;
|
||||
sizeY = (int)Constants.RegionSize;
|
||||
|
||||
Hashtable hash = new Hashtable();
|
||||
hash["region_name"] = info.RegionName;
|
||||
|
@ -134,8 +136,15 @@ namespace OpenSim.Services.Connectors.Hypergrid
|
|||
externalName = (string)hash["external_name"];
|
||||
//m_log.Debug(">> HERE, externalName: " + externalName);
|
||||
}
|
||||
if (hash["size_x"] != null)
|
||||
{
|
||||
Int32.TryParse((string)hash["size_x"], out sizeX);
|
||||
}
|
||||
if (hash["size_y"] != null)
|
||||
{
|
||||
Int32.TryParse((string)hash["size_y"], out sizeY);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -785,7 +785,10 @@ namespace OpenSim.Services.LLLoginService
|
|||
ulong handle;
|
||||
string imageURL = string.Empty, reason = string.Empty;
|
||||
string message;
|
||||
if (m_GatekeeperConnector.LinkRegion(gatekeeper, out regionID, out handle, out domainName, out imageURL, out reason))
|
||||
int sizeX = (int)Constants.RegionSize;
|
||||
int sizeY = (int)Constants.RegionSize;
|
||||
|
||||
if (m_GatekeeperConnector.LinkRegion(gatekeeper, out regionID, out handle, out domainName, out imageURL, out reason, out sizeX, out sizeY))
|
||||
{
|
||||
string homeURI = null;
|
||||
if (account.ServiceURLs != null && account.ServiceURLs.ContainsKey("HomeURI"))
|
||||
|
|
Loading…
Reference in New Issue