diff options
* Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
* Removed unnecessary debug messages.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 4d347cd..93cb60c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | |||
@@ -405,6 +405,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
405 | if (parts.Length >= 2) | 405 | if (parts.Length >= 2) |
406 | { | 406 | { |
407 | portstr = parts[1]; | 407 | portstr = parts[1]; |
408 | //m_log.Debug("-- port = " + portstr); | ||
408 | if (!UInt32.TryParse(portstr, out port)) | 409 | if (!UInt32.TryParse(portstr, out port)) |
409 | regionName = parts[1]; | 410 | regionName = parts[1]; |
410 | } | 411 | } |
@@ -620,8 +621,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
620 | clonedRegion.RegionLocX = (int)x; | 621 | clonedRegion.RegionLocX = (int)x; |
621 | clonedRegion.RegionLocY = (int)y; | 622 | clonedRegion.RegionLocY = (int)y; |
622 | 623 | ||
623 | // Get the user's home region information | 624 | // Get the user's home region information and adapt the region handle |
624 | GridRegion home = m_aScene.GridService.GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID); | 625 | GridRegion home = GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID); |
626 | if (m_HyperlinkHandles.ContainsKey(uinfo.UserProfile.HomeRegionID)) | ||
627 | { | ||
628 | ulong realHandle = m_HyperlinkHandles[uinfo.UserProfile.HomeRegionID]; | ||
629 | Utils.LongToUInts(realHandle, out x, out y); | ||
630 | m_log.DebugFormat("[HGrid]: Foreign user is going elsewhere. Adjusting home handle from {0}-{1} to {2}-{3}", home.RegionLocX, home.RegionLocY, x, y); | ||
631 | home.RegionLocX = (int)x; | ||
632 | home.RegionLocY = (int)y; | ||
633 | } | ||
625 | 634 | ||
626 | // Get the user's service URLs | 635 | // Get the user's service URLs |
627 | string serverURI = ""; | 636 | string serverURI = ""; |