Merge branch 'master' into careminster

4 files changed, 57 insertions, 8 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 9dd6663..30d4f21 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -388,8 +388,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 string assetServerURL = string.Empty;
                 if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL))
                 {
-                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", id);
-                    AssetService.Get(assetServerURL + "/" + id, InventoryAccessModule, AssetReceived);
+                    if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
+                        assetServerURL = assetServerURL + "/";
+
+                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
+                    AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived);
                     return;
                 }
             }
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 81b65c5..d20c9eb 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -73,7 +73,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         public AssetBase FetchAsset(string url, UUID assetID)
         {
-            AssetBase asset = m_scene.AssetService.Get(url + "/" + assetID.ToString());
+            if (!url.EndsWith("/") && !url.EndsWith("="))
+                url = url + "/";
+
+            AssetBase asset = m_scene.AssetService.Get(url + assetID.ToString());
 
             if (asset != null)
             {
@@ -87,6 +90,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             if (asset != null)
             {
+                if (!url.EndsWith("/") && !url.EndsWith("="))
+                    url = url + "/";
+
                 // See long comment in AssetCache.AddAsset
                 if (!asset.Temporary || asset.Local)
                 {
@@ -99,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     Copy(asset, asset1);
                     try
                     {
-                        asset1.ID = url + "/" + asset.ID;
+                        asset1.ID = url + asset.ID;
                     }
                     catch
                     {
diff --git a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
index 5c31639..bb5d51f 100644
--- a/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/HGAssetServiceConnector.cs
@@ -29,7 +29,9 @@ using log4net;
 using Nini.Config;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Reflection;
+using System.Web;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Connectors.Hypergrid;
@@ -73,11 +75,26 @@ namespace OpenSim.Services.Connectors
             if (Uri.TryCreate(id, UriKind.Absolute, out assetUri) &&
                     assetUri.Scheme == Uri.UriSchemeHttp)
             {
-                url = "http://" + assetUri.Authority;
-                assetID = assetUri.LocalPath.Trim(new char[] {'/'});
+                // Simian
+                if (assetUri.Query != string.Empty)
+                {
+                    NameValueCollection qscoll = HttpUtility.ParseQueryString(assetUri.Query);
+                    assetID = qscoll["id"];
+                    if (assetID != null)
+                        url = id.Replace(assetID, ""); // Malformed again, as simian expects
+                    else
+                        url = id; // !!! best effort
+                }
+                else // robust
+                {
+                    url = "http://" + assetUri.Authority;
+                    assetID = assetUri.LocalPath.Trim(new char[] { '/' });
+                }
+
                 return true;
             }
 
+            m_log.DebugFormat("[HG ASSET SERVICE]: Malformed URL {0}", id);
             return false;
         }
 
diff --git a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
index ff1dd5f..8ac89cc 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HeloServiceConnector.cs
@@ -47,13 +47,36 @@ namespace OpenSim.Services.Connectors
 
         public HeloServicesConnector(string serverURI)
         {
-            m_ServerURI = serverURI.TrimEnd('/');
+            if (!serverURI.EndsWith("="))
+                m_ServerURI = serverURI.TrimEnd('/') + "/helo/";
+            else
+            {
+                // Simian sends malformed urls like this:
+                // http://valley.virtualportland.org/simtest/Grid/?id=
+                //
+                try
+                {
+                    Uri uri = new Uri(serverURI + "xxx");
+                    if (uri.Query == string.Empty)
+                        m_ServerURI = serverURI.TrimEnd('/') + "/helo/";
+                    else
+                    {
+                        serverURI = serverURI + "xxx";
+                        m_ServerURI = serverURI.Replace("?" + uri.Query, "");
+                        m_ServerURI = m_ServerURI.TrimEnd('/') + "/helo/";
+                    }
+                }
+                catch (UriFormatException e)
+                {
+                    m_log.WarnFormat("[HELO SERVICE]: Malformed URL {0}", serverURI);
+                }
+            }
         }
 
 
         public virtual string Helo()
         {
-            HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI + "/helo/");
+            HttpWebRequest req = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
             // Eventually we need to switch to HEAD
             /* req.Method = "HEAD"; */