aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRoger Kirkman2014-02-05 13:31:01 +0000
committerRobert Adams2014-02-06 11:33:17 -0800
commitcf61cdf58cf5a0f0fa67f1e6078d5cbed0f036c9 (patch)
tree6e89f8f0741d753d2927399b20070ac877159c42 /OpenSim
parentUpdate the SimianMaptile uploader to accommodate varregions. (diff)
downloadopensim-SC_OLD-cf61cdf58cf5a0f0fa67f1e6078d5cbed0f036c9.zip
opensim-SC_OLD-cf61cdf58cf5a0f0fa67f1e6078d5cbed0f036c9.tar.gz
opensim-SC_OLD-cf61cdf58cf5a0f0fa67f1e6078d5cbed0f036c9.tar.bz2
opensim-SC_OLD-cf61cdf58cf5a0f0fa67f1e6078d5cbed0f036c9.tar.xz
Fix - Viewer crash during HG Teleport
Signed-off-by: Robert Adams <misterblue@misterblue.com>
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index d0a0b17..20397a1 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -244,13 +244,13 @@ namespace OpenSim.Services.Connectors.Hypergrid
244 } 244 }
245 if (hash["size_x"] != null) 245 if (hash["size_x"] != null)
246 { 246 {
247 Int32.TryParse((string)hash["x"], out n); 247 Int32.TryParse((string)hash["size_x"], out n);
248 region.RegionSizeX = n; 248 region.RegionSizeX = n;
249 //m_log.Debug(">> HERE, x: " + region.RegionLocX); 249 //m_log.Debug(">> HERE, x: " + region.RegionLocX);
250 } 250 }
251 if (hash["size_y"] != null) 251 if (hash["size_y"] != null)
252 { 252 {
253 Int32.TryParse((string)hash["y"], out n); 253 Int32.TryParse((string)hash["size_y"], out n);
254 region.RegionSizeY = n; 254 region.RegionSizeY = n;
255 //m_log.Debug(">> HERE, y: " + region.RegionLocY); 255 //m_log.Debug(">> HERE, y: " + region.RegionLocY);
256 } 256 }