aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorMelanie Thielker2016-07-11 22:31:32 +0100
committerMelanie Thielker2016-07-11 22:31:32 +0100
commit8239e29be7b44da3ed75f3487ccf76015b2d2a33 (patch)
tree660f1a4cf9e52c362e342804f3f70f642552b647 /OpenSim/Services/Connectors
parentdon't auto return objects if they have sitting avatars (not npcs) - mantis 78... (diff)
downloadopensim-SC-8239e29be7b44da3ed75f3487ccf76015b2d2a33.zip
opensim-SC-8239e29be7b44da3ed75f3487ccf76015b2d2a33.tar.gz
opensim-SC-8239e29be7b44da3ed75f3487ccf76015b2d2a33.tar.bz2
opensim-SC-8239e29be7b44da3ed75f3487ccf76015b2d2a33.tar.xz
Change the user verification call back to use the host name instead of the
IP address. Fixes NGINX on OSGrid getting confuzzled.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 1dcc82a..1b45bcf 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -572,7 +572,11 @@ namespace OpenSim.Services.Connectors.Hypergrid
572 XmlRpcResponse response = null; 572 XmlRpcResponse response = null;
573 try 573 try
574 { 574 {
575 response = request.Send(m_ServerURL, 10000); 575 // We can not use m_ServerURL here anymore because it causes
576 // the HTTP request to be built without a host name. This messes
577 // with OSGrid's NGINX and can make OSGrid avatars unable to TP
578 // to other grids running recent mono.
579 response = request.Send(m_ServerURLHost, 10000);
576 } 580 }
577 catch (Exception e) 581 catch (Exception e)
578 { 582 {