aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-12-19 10:16:07 -0800
committerDiva Canto2009-12-19 10:16:07 -0800
commit26e3a8ee4b63f67b7fd3957b9f8b94d874ed5627 (patch)
tree5ce45b14bfd434d93ca1ec87710c979989b6d330 /OpenSim
parentrandom drive-by minor math optimization. No need for concern, bitshed was wit... (diff)
downloadopensim-SC_OLD-26e3a8ee4b63f67b7fd3957b9f8b94d874ed5627.zip
opensim-SC_OLD-26e3a8ee4b63f67b7fd3957b9f8b94d874ed5627.tar.gz
opensim-SC_OLD-26e3a8ee4b63f67b7fd3957b9f8b94d874ed5627.tar.bz2
opensim-SC_OLD-26e3a8ee4b63f67b7fd3957b9f8b94d874ed5627.tar.xz
* Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
* Removed unnecessary debug messages.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs13
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs4
-rw-r--r--OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs4
3 files changed, 16 insertions, 5 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
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
index 2f33bab..968a6d6 100644
--- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
@@ -92,12 +92,12 @@ namespace OpenSim.Services.Connectors.Grid
92 try 92 try
93 { 93 {
94 UUID.TryParse((string)hash["uuid"], out uuid); 94 UUID.TryParse((string)hash["uuid"], out uuid);
95 m_log.Debug(">> HERE, uuid: " + uuid); 95 //m_log.Debug(">> HERE, uuid: " + uuid);
96 info.RegionID = uuid; 96 info.RegionID = uuid;
97 if ((string)hash["handle"] != null) 97 if ((string)hash["handle"] != null)
98 { 98 {
99 realHandle = Convert.ToUInt64((string)hash["handle"]); 99 realHandle = Convert.ToUInt64((string)hash["handle"]);
100 m_log.Debug(">> HERE, realHandle: " + realHandle); 100 //m_log.Debug(">> HERE, realHandle: " + realHandle);
101 } 101 }
102 //if (hash["region_image"] != null) 102 //if (hash["region_image"] != null)
103 //{ 103 //{