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

varregion: pass region size in more HG services.

varregion
Robert Adams 2014-01-24 06:30:38 -08:00
parent 674a3a5639
commit afb2e07111
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
View File

@ -1,4 +1,4 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
@ -105,6 +105,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
hash["uuid"] = regInfo.RegionID.ToString(); hash["uuid"] = regInfo.RegionID.ToString();
hash["x"] = regInfo.RegionLocX.ToString(); hash["x"] = regInfo.RegionLocX.ToString();
hash["y"] = regInfo.RegionLocY.ToString(); hash["y"] = regInfo.RegionLocY.ToString();
hash["size_x"] = regInfo.RegionSizeX.ToString();
hash["size_y"] = regInfo.RegionSizeY.ToString();
hash["region_name"] = regInfo.RegionName; hash["region_name"] = regInfo.RegionName;
hash["hostname"] = regInfo.ExternalHostName; hash["hostname"] = regInfo.ExternalHostName;
hash["http_port"] = regInfo.HttpPort.ToString(); hash["http_port"] = regInfo.HttpPort.ToString();

2
OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
View File

@ -132,6 +132,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
hash["uuid"] = regInfo.RegionID.ToString(); hash["uuid"] = regInfo.RegionID.ToString();
hash["x"] = regInfo.RegionLocX.ToString(); hash["x"] = regInfo.RegionLocX.ToString();
hash["y"] = regInfo.RegionLocY.ToString(); hash["y"] = regInfo.RegionLocY.ToString();
hash["size_x"] = regInfo.RegionSizeX.ToString();
hash["size_y"] = regInfo.RegionSizeY.ToString();
hash["region_name"] = regInfo.RegionName; hash["region_name"] = regInfo.RegionName;
hash["hostname"] = regInfo.ExternalHostName; hash["hostname"] = regInfo.ExternalHostName;
hash["http_port"] = regInfo.HttpPort.ToString(); hash["http_port"] = regInfo.HttpPort.ToString();

12
OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
View File

@ -242,6 +242,18 @@ namespace OpenSim.Services.Connectors.Hypergrid
region.RegionLocY = n; region.RegionLocY = n;
//m_log.Debug(">> HERE, y: " + region.RegionLocY); //m_log.Debug(">> HERE, y: " + region.RegionLocY);
} }
if (hash["size_x"] != null)
{
Int32.TryParse((string)hash["x"], out n);
region.RegionSizeX = n;
//m_log.Debug(">> HERE, x: " + region.RegionLocX);
}
if (hash["size_y"] != null)
{
Int32.TryParse((string)hash["y"], out n);
region.RegionSizeY = n;
//m_log.Debug(">> HERE, y: " + region.RegionLocY);
}
if (hash["region_name"] != null) if (hash["region_name"] != null)
{ {
region.RegionName = (string)hash["region_name"]; region.RegionName = (string)hash["region_name"];