aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMic Bowman2014-01-23 16:20:18 -0800
committerMic Bowman2014-01-23 16:20:18 -0800
commit674a3a5639cf34532113352e0b72e7a6ba7563a2 (patch)
tree4dc1fa6543c3f136729cf8bc67b6c388d5805f3f
parentMerge branch 'master' into varregion (diff)
downloadopensim-SC_OLD-674a3a5639cf34532113352e0b72e7a6ba7563a2.zip
opensim-SC_OLD-674a3a5639cf34532113352e0b72e7a6ba7563a2.tar.gz
opensim-SC_OLD-674a3a5639cf34532113352e0b72e7a6ba7563a2.tar.bz2
opensim-SC_OLD-674a3a5639cf34532113352e0b72e7a6ba7563a2.tar.xz
Enable the simulator to handle region size information returned from
a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side will be updated separately.
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs12
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index c9c6c31..5d7dcfd 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -255,6 +255,18 @@ namespace OpenSim.Services.Connectors.Hypergrid
255 region.RegionLocY = n; 255 region.RegionLocY = n;
256 //m_log.Debug(">> HERE, y: " + region.RegionLocY); 256 //m_log.Debug(">> HERE, y: " + region.RegionLocY);
257 } 257 }
258 if (hash["size_x"] != null)
259 {
260 Int32.TryParse((string)hash["size_x"], out n);
261 region.RegionSizeX = n;
262 //m_log.Debug(">> HERE, x: " + region.RegionLocX);
263 }
264 if (hash["size_y"] != null)
265 {
266 Int32.TryParse((string)hash["size_y"], out n);
267 region.RegionSizeY = n;
268 //m_log.Debug(">> HERE, y: " + region.RegionLocY);
269 }
258 if (hash["region_name"] != null) 270 if (hash["region_name"] != null)
259 { 271 {
260 region.RegionName = (string)hash["region_name"]; 272 region.RegionName = (string)hash["region_name"];