diff options
author | CasperW | 2009-12-21 13:29:48 +0100 |
---|---|---|
committer | CasperW | 2009-12-21 13:29:48 +0100 |
commit | d8d6e8a30415197eb55c59172abfb890ec7a46bd (patch) | |
tree | db937d6c6e3816932781e7be90c318408d117a78 /OpenSim/Region/CoreModules | |
parent | Fixed a nasty crash in StandUp() that occurred when the part got killed with ... (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.zip opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.gz opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.bz2 opensim-SC-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.xz |
Merge branch 'master' into casper
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs | 4 |
2 files changed, 14 insertions, 3 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 = ""; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs index d9f6e33..bdfe3b1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs | |||
@@ -157,7 +157,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
157 | } | 157 | } |
158 | 158 | ||
159 | // m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); | 159 | // m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); |
160 | reason = "Did not find region."; | 160 | uint x = 0, y = 0; |
161 | Utils.LongToUInts(regionHandle, out x, out y); | ||
162 | reason = "Did not find region " + x + "-" + y; | ||
161 | return false; | 163 | return false; |
162 | } | 164 | } |
163 | 165 | ||