diff options
| author | BlueWall | 2014-03-27 12:21:38 -0400 |
|---|---|---|
| committer | BlueWall | 2014-03-27 12:21:38 -0400 |
| commit | a15282f023548ce6e1c6a728d913999ee120e9c1 (patch) | |
| tree | b33a39a66549521fe5782d87378b3b4209822e81 /OpenSim/Services | |
| parent | Fix issue with user picks creation. The snapshot id is UUID.Zero in new parcels. (diff) | |
| parent | Log errors in MakeRequest() as INFO, not ERROR. Some communications problems ... (diff) | |
| download | opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.zip opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.gz opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.bz2 opensim-SC-a15282f023548ce6e1c6a728d913999ee120e9c1.tar.xz | |
Merge branch 'master' into m_test
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 54191f6..61f8516 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
| @@ -257,6 +257,18 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 257 | region.RegionLocY = n; | 257 | region.RegionLocY = n; |
| 258 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); | 258 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); |
| 259 | } | 259 | } |
| 260 | if (hash["size_x"] != null) | ||
| 261 | { | ||
| 262 | Int32.TryParse((string)hash["size_x"], out n); | ||
| 263 | region.RegionSizeX = n; | ||
| 264 | //m_log.Debug(">> HERE, x: " + region.RegionLocX); | ||
| 265 | } | ||
| 266 | if (hash["size_y"] != null) | ||
| 267 | { | ||
| 268 | Int32.TryParse((string)hash["size_y"], out n); | ||
| 269 | region.RegionSizeY = n; | ||
| 270 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); | ||
| 271 | } | ||
| 260 | if (hash["region_name"] != null) | 272 | if (hash["region_name"] != null) |
| 261 | { | 273 | { |
| 262 | region.RegionName = (string)hash["region_name"]; | 274 | region.RegionName = (string)hash["region_name"]; |