aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-09-28 20:58:21 -0700
committerDiva Canto2009-09-28 20:58:21 -0700
commit6653a30487d76760451467a22849aba725f1e7cf (patch)
tree0881b0b7996c2b2d18c4678ede5f4f393c95ccb2 /OpenSim
parentFixed bug in Check4096 (HG). (diff)
downloadopensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.zip
opensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.tar.gz
opensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.tar.bz2
opensim-SC_OLD-6653a30487d76760451467a22849aba725f1e7cf.tar.xz
Fixed bug in HG that was causing secondlife:// refs to bomb the client.
Also fiddled a bit more with the initial CAP in the user server.
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserLoginService.cs5
-rw-r--r--OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs12
2 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 47bbeca..c95e054 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -279,9 +279,8 @@ namespace OpenSim.Grid.UserServer.Modules
279 //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath); 279 //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
280 280
281 // Take off trailing / so that the caps path isn't //CAPS/someUUID 281 // Take off trailing / so that the caps path isn't //CAPS/someUUID
282 if (regionInfo.httpServerURI.EndsWith("/")) 282 string uri = regionInfo.httpServerURI.Trim(new char[] { '/' });
283 regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1); 283 response.SeedCapability = uri + CapsUtil.GetCapsSeedPath(capsPath);
284 response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
285 284
286 285
287 // Notify the target of an incoming user 286 // Notify the target of an incoming user
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
index dd19b01..3d7f112 100644
--- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
@@ -69,7 +69,17 @@ namespace OpenSim.Services.Connectors.Grid
69 XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); 69 XmlRpcRequest request = new XmlRpcRequest("link_region", paramList);
70 string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; 70 string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/";
71 m_log.Debug("[HGrid]: Linking to " + uri); 71 m_log.Debug("[HGrid]: Linking to " + uri);
72 XmlRpcResponse response = request.Send(uri, 10000); 72 XmlRpcResponse response = null;
73 try
74 {
75 response = request.Send(uri, 10000);
76 }
77 catch (Exception e)
78 {
79 m_log.Debug("[HGrid]: Exception " + e.Message);
80 return uuid;
81 }
82
73 if (response.IsFault) 83 if (response.IsFault)
74 { 84 {
75 m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString); 85 m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString);