From 4cf60c5d9d95b5d7566c24f79f321e39fc2e2679 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 8 Jun 2011 19:51:48 -0700
Subject: Removing special casing on failures. This may also fix reports of
 this issue: 22:07:53 - [USER AGENT CONNECTOR]: remote call to
 http://hg.osgrid.org:80/ returned an error: Requested method [locate_user]
 from 127.0.0.1 threw exception: Object reference not set to an instance of an
 object   at OpenSim.Services.HypergridService.UserAgentService.LocateUser
 (UUID userID) [0x00000] in <filename unknown>:0

---
 OpenSim/Services/HypergridService/UserAgentService.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 7ed5ea5..1559cf3 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -197,9 +197,11 @@ namespace OpenSim.Services.HypergridService
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
                 // restore the old travel info
-                if(reason != "Logins Disabled")
+                lock (m_TravelingAgents)
                 {
-                    lock (m_TravelingAgents)
+                    if (old == null)
+                        m_TravelingAgents.Remove(agentCircuit.SessionID);
+                    else
                         m_TravelingAgents[agentCircuit.SessionID] = old;
                 }
 
-- 
cgit v1.1


From 0ae022d68822c05130f76a6e80bccd669a3d76ed Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 10 Jun 2011 20:59:57 -0700
Subject: Decreased timeout of HG StatusNotification to 4secs.
 http://opensimulator.org/mantis/view.php?id=5516

---
 OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 853e524..b7e09e8 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -427,7 +427,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             XmlRpcResponse response = null;
             try
             {
-                response = request.Send(m_ServerURL, 10000);
+                response = request.Send(m_ServerURL, 4000);
             }
             catch (Exception e)
             {
-- 
cgit v1.1


From 5f311c91c781d09e266fb76cb7747550fe2afc16 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 10 Jun 2011 21:07:50 -0700
Subject: More tweaking on the UserAgentServiceConnector: add constructor that
 does not do DNS lookup, and use that for friends notification.

---
 .../Hypergrid/UserAgentServiceConnector.cs         | 35 ++++++++++++++--------
 1 file changed, 22 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index b7e09e8..2a5fb40 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -51,22 +51,31 @@ namespace OpenSim.Services.Connectors.Hypergrid
             MethodBase.GetCurrentMethod().DeclaringType);
 
         string m_ServerURL;
-        public UserAgentServiceConnector(string url)
+
+        public UserAgentServiceConnector(string url) : this(url, true)
+        {
+        }
+
+        public UserAgentServiceConnector(string url, bool dnsLookup)
         {
             m_ServerURL = url;
-            // Doing this here, because XML-RPC or mono have some strong ideas about
-            // caching DNS translations.
-            try
-            {
-                Uri m_Uri = new Uri(m_ServerURL);
-                IPAddress ip = Util.GetHostFromDNS(m_Uri.Host);
-                m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString());
-                if (!m_ServerURL.EndsWith("/"))
-                    m_ServerURL += "/";
-            }
-            catch (Exception e)
+
+            if (dnsLookup)
             {
-                m_log.DebugFormat("[USER AGENT CONNECTOR]: Malformed Uri {0}: {1}", m_ServerURL, e.Message);
+                // Doing this here, because XML-RPC or mono have some strong ideas about
+                // caching DNS translations.
+                try
+                {
+                    Uri m_Uri = new Uri(m_ServerURL);
+                    IPAddress ip = Util.GetHostFromDNS(m_Uri.Host);
+                    m_ServerURL = m_ServerURL.Replace(m_Uri.Host, ip.ToString());
+                    if (!m_ServerURL.EndsWith("/"))
+                        m_ServerURL += "/";
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[USER AGENT CONNECTOR]: Malformed Uri {0}: {1}", m_ServerURL, e.Message);
+                }
             }
             m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0} ({1})", url, m_ServerURL);
         }
-- 
cgit v1.1