3 files changed, 55 insertions, 55 deletions

diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 7ad6f0b..2a3dacc 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -181,8 +181,7 @@ namespace OpenSim.Services.Connectors
 
         public AssetBase Get(string id)
         {
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             AssetBase asset = null;
             if (m_Cache != null)
@@ -219,8 +218,7 @@ namespace OpenSim.Services.Connectors
                     return fullAsset.Metadata;
             }
 
-//            string uri = MapServer(id) + "/assets/" + id + "/metadata";
-            string uri = MapServer(id) + "assets/" + id + "/metadata";
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             AssetMetadata asset = SynchronousRestObjectRequester.
                     MakeRequest<int, AssetMetadata>("GET", uri, 0);
@@ -262,8 +260,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Get(string id, Object sender, AssetRetrieved handler)
         {
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             AssetBase asset = null;
             if (m_Cache != null)
@@ -382,9 +379,9 @@ namespace OpenSim.Services.Connectors
                 return asset.ID;
             }
 
-//            string uri = MapServer(asset.FullID.ToString()) + "/assets/";
-
-            string uri = MapServer(asset.FullID.ToString()) + "assets/";
+            string uri = Path.Combine(MapServer(asset.FullID.ToString()), "/assets/");
+            if (!uri.EndsWith("/"))
+                uri += "/";
 
             string newID = string.Empty;
             try
@@ -461,8 +458,7 @@ namespace OpenSim.Services.Connectors
             }
             asset.Data = data;
 
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<AssetBase, bool>("POST", uri, asset))
@@ -477,8 +473,7 @@ namespace OpenSim.Services.Connectors
 
         public bool Delete(string id)
         {
-//            string uri = MapServer(id) + "/assets/" + id;
-            string uri = MapServer(id) + "assets/" + id;
+            string uri = Path.Combine(MapServer(id), Path.Combine("assets", id));
 
             if (SynchronousRestObjectRequester.
                     MakeRequest<int, bool>("DELETE", uri, 0))
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 3fd0c53..6cd21d1 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -144,44 +144,48 @@ namespace OpenSim.Services.Connectors.Friends
 
         private bool Call(GridRegion region, Dictionary<string, object> sendData)
         {
-            string reqString = ServerUtils.BuildQueryString(sendData);
-            //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
-            if (region == null)
-                return false;
-
-            string path = ServicePath();
-            if (!region.ServerURI.EndsWith("/"))
-                path = "/" + path;
-            string uri = region.ServerURI + path;
-            m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
-
-            try
-            {
-                string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
-                if (reply != string.Empty)
+            Util.FireAndForget(x => {
+                string reqString = ServerUtils.BuildQueryString(sendData);
+                //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
+                if (region == null)
+                    return;
+
+                string path = ServicePath();
+                if (!region.ServerURI.EndsWith("/"))
+                    path = "/" + path;
+                string uri = region.ServerURI + path;
+                m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
+
+                try
                 {
-                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
-
-                    if (replyData.ContainsKey("RESULT"))
+                    string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
+                    if (reply != string.Empty)
                     {
-                        if (replyData["RESULT"].ToString().ToLower() == "true")
-                            return true;
+                        Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                        if (replyData.ContainsKey("RESULT"))
+                        {
+//                            if (replyData["RESULT"].ToString().ToLower() == "true")
+//                                return;
+//                            else
+                            return;
+                        }
                         else
-                            return false;
+                            m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
+
                     }
                     else
-                        m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
-
+                        m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
                 }
-                else
-                    m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
-            }
-            catch (Exception e)
-            {
-                m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
-            }
-
-            return false;
+
+                return;
+            });
+
+            return true;
         }
     }
 }
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index e1c2243..508baf7 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -395,17 +395,18 @@ namespace OpenSim.Services.Connectors.Simulation
         private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly)
         {
 //            m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
+            Util.FireAndForget(x => {
+                string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
 
-            string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
-
-            try
-            {
-                WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString());
-            }
+                try
+                {
+                    WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
+                }
+                catch (Exception e)
+                {
+                    m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString());
+                }
+            });
 
             return true;
         }