aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2014-01-24 06:30:38 -0800
committerRobert Adams2014-01-24 06:30:38 -0800
commitafb2e0711118706aa9e27246246d08f26e0daca5 (patch)
tree438c1259184a02dc105cbdb89e5a1e71dbb1038b /OpenSim
parentEnable the simulator to handle region size information returned from (diff)
downloadopensim-SC_OLD-afb2e0711118706aa9e27246246d08f26e0daca5.zip
opensim-SC_OLD-afb2e0711118706aa9e27246246d08f26e0daca5.tar.gz
opensim-SC_OLD-afb2e0711118706aa9e27246246d08f26e0daca5.tar.bz2
opensim-SC_OLD-afb2e0711118706aa9e27246246d08f26e0daca5.tar.xz
varregion: pass region size in more HG services.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs4
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs12
3 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
index 5d03097..f25e6e0 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -105,6 +105,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
105 hash["uuid"] = regInfo.RegionID.ToString(); 105 hash["uuid"] = regInfo.RegionID.ToString();
106 hash["x"] = regInfo.RegionLocX.ToString(); 106 hash["x"] = regInfo.RegionLocX.ToString();
107 hash["y"] = regInfo.RegionLocY.ToString(); 107 hash["y"] = regInfo.RegionLocY.ToString();
108 hash["size_x"] = regInfo.RegionSizeX.ToString();
109 hash["size_y"] = regInfo.RegionSizeY.ToString();
108 hash["region_name"] = regInfo.RegionName; 110 hash["region_name"] = regInfo.RegionName;
109 hash["hostname"] = regInfo.ExternalHostName; 111 hash["hostname"] = regInfo.ExternalHostName;
110 hash["http_port"] = regInfo.HttpPort.ToString(); 112 hash["http_port"] = regInfo.HttpPort.ToString();
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index 7137836..15b5b31 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -132,6 +132,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
132 hash["uuid"] = regInfo.RegionID.ToString(); 132 hash["uuid"] = regInfo.RegionID.ToString();
133 hash["x"] = regInfo.RegionLocX.ToString(); 133 hash["x"] = regInfo.RegionLocX.ToString();
134 hash["y"] = regInfo.RegionLocY.ToString(); 134 hash["y"] = regInfo.RegionLocY.ToString();
135 hash["size_x"] = regInfo.RegionSizeX.ToString();
136 hash["size_y"] = regInfo.RegionSizeY.ToString();
135 hash["region_name"] = regInfo.RegionName; 137 hash["region_name"] = regInfo.RegionName;
136 hash["hostname"] = regInfo.ExternalHostName; 138 hash["hostname"] = regInfo.ExternalHostName;
137 hash["http_port"] = regInfo.HttpPort.ToString(); 139 hash["http_port"] = regInfo.HttpPort.ToString();
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 2511c08..d0a0b17 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -242,6 +242,18 @@ namespace OpenSim.Services.Connectors.Hypergrid
242 region.RegionLocY = n; 242 region.RegionLocY = n;
243 //m_log.Debug(">> HERE, y: " + region.RegionLocY); 243 //m_log.Debug(">> HERE, y: " + region.RegionLocY);
244 } 244 }
245 if (hash["size_x"] != null)
246 {
247 Int32.TryParse((string)hash["x"], out n);
248 region.RegionSizeX = n;
249 //m_log.Debug(">> HERE, x: " + region.RegionLocX);
250 }
251 if (hash["size_y"] != null)
252 {
253 Int32.TryParse((string)hash["y"], out n);
254 region.RegionSizeY = n;
255 //m_log.Debug(">> HERE, y: " + region.RegionLocY);
256 }
245 if (hash["region_name"] != null) 257 if (hash["region_name"] != null)
246 { 258 {
247 region.RegionName = (string)hash["region_name"]; 259 region.RegionName = (string)hash["region_name"];