From c6ce464dbc64dc24878a8032412e82b02b9314f6 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Fri, 23 Dec 2011 10:13:32 -0800
Subject: remove the old region crossing handler

---
 .../Framework/EntityTransfer/EntityTransferModule.cs           | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 098e5cb..cbef6ce 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1724,16 +1724,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
                 grp.ScheduleGroupForFullUpdate();
             }
-
-
-
-
-
-            if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
-            {
-                grp.RootPart.GroupPosition = oldGroupPosition;
-                grp.ScheduleGroupForFullUpdate();
-            }
         }
 
 
-- 
cgit v1.1


From 26bb95fe3d5239c183bc3b312ef05e73fc06749c Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 23 Dec 2011 10:58:30 -0800
Subject: HG: AAdded a few missing /'s at the end of URLs

---
 OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs          | 2 +-
 OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs  | 2 ++
 .../Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs  | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
index 7cfd6e8..ff1dd5f 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors
 
         public virtual string Helo()
         {
-            HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI + "/helo");
+            HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI + "/helo/");
             // Eventually we need to switch to HEAD
             /* req.Method = "HEAD"; */
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 9573e21..99523a1 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -86,6 +86,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianAssetServiceConnector(string url)
         {
+            if (!url.EndsWith("/") && !url.EndsWith("="))
+                url = url + '/';
             m_serverUrl = url;
         }
 
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 39df1f5..f828abb 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -92,7 +92,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public SimianInventoryServiceConnector(string url)
         {
+            if (!url.EndsWith("/") && !url.EndsWith("="))
+                url = url + '/';
             m_serverUrl = url;
+
         }
 
         public void Initialise(IConfigSource source)
-- 
cgit v1.1