From d96f5fa57db52c872b8e431bc9a1137f0525cbc5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 2 Sep 2010 16:36:05 -0700
Subject: Quick fix for making global references for gatekeepers that are not
 domain:port work. This needs a serious rewrite, as the assumption domain:port
 doesn't hold from here on. Just quick-fixing for now.

---
 .../Simulation/SimulationServiceConnector.cs       | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 2b96b96..df818f5 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -104,17 +104,23 @@ namespace OpenSim.Services.Connectors.Simulation
                 return false;
             }
 
-            // Eventually, we want to use a caps url instead of the agentID
             string uri = string.Empty;
-            try
-            {
-                uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + aCircuit.AgentID + "/";
-            }
-            catch (Exception e)
+
+            // HACK -- Simian grid make it work!!!
+            if (destination.ServerURI != string.Empty)
+                uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
+            else
             {
-                m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
-                reason = e.Message;
-                return false;
+                try
+                {
+                    uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + aCircuit.AgentID + "/";
+                }
+                catch (Exception e)
+                {
+                    m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
+                    reason = e.Message;
+                    return false;
+                }
             }
 
             //Console.WriteLine("   >>> DoCreateChildAgentCall <<< " + uri);
-- 
cgit v1.1


From 85e9160552ea72e469863e077d1084da80e12222 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 3 Sep 2010 09:02:08 -0700
Subject: More tweaks related to my previous commit. Tweaks sux.

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

(limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index df818f5..b2dec96 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors.Simulation
             string uri = string.Empty;
 
             // HACK -- Simian grid make it work!!!
-            if (destination.ServerURI != string.Empty)
+            if (destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:"))
                 uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
             else
             {
-- 
cgit v1.1


From a5cce8d6d721da5e6f63a9564f531bf27be75320 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 3 Sep 2010 10:13:41 -0700
Subject: Last+1 tweak.

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

(limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index b2dec96..c7d1869 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors.Simulation
             string uri = string.Empty;
 
             // HACK -- Simian grid make it work!!!
-            if (destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:"))
+            if (destination != null && destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:"))
                 uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
             else
             {
-- 
cgit v1.1


From 0a0f38b23c2674d98ab055b23d4bbd20896cc4fd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 3 Sep 2010 10:31:16 -0700
Subject: Last+2 tweak

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

(limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index c7d1869..a5f748f 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Services.Connectors.Simulation
             string uri = string.Empty;
 
             // HACK -- Simian grid make it work!!!
-            if (destination != null && destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:"))
+            if (destination.ServerURI != null && destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:"))
                 uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
             else
             {
-- 
cgit v1.1