From dc0455e217b8da3fc8bd49e959b57d6021312b77 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 19:11:44 +0100
Subject: In XAssetService, on a delete asset request also delete the asset in
 any chained service.

This eliminates the async migration since it causes a race condition with the "delete asset" console command
---
 OpenSim/Services/AssetService/XAssetService.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index 8a2ca7c..6047616 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -205,15 +205,16 @@ namespace OpenSim.Services.AssetService
             if (!UUID.TryParse(id, out assetID))
                 return false;
 
-            // Don't bother deleting from a chained asset service.  This isn't a big deal since deleting happens
-            // very rarely.
+            if (HasChainedAssetService)
+                m_ChainedAssetService.Delete(id);
 
             return m_Database.Delete(id);
         }
 
         private void MigrateFromChainedService(AssetBase asset)
         {
-            Util.FireAndForget(o => { Store(asset); m_ChainedAssetService.Delete(asset.ID); });
+            Store(asset); 
+            m_ChainedAssetService.Delete(asset.ID);
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1


From 00093a305d225c98ffe00b656df7943cb50c42b0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 18:35:23 -0700
Subject: Changed HG status notifications timeout down to 15secs from the
 default 100.

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

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
index e984a54..622d4e1 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), 15);
             }
             catch (Exception e)
             {
-- 
cgit v1.1


From 20f2cf876982b2c7589b67ce4c8f09d8fff3e9f1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:54:10 -0700
Subject: More debug mantis #6625

---
 OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index b1dd84e..1e6ff7e 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -112,6 +112,7 @@ namespace OpenSim.Services.Connectors.Friends
 
             try
             {
+                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Calling {0}", uri);
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
                 if (reply != string.Empty)
                 {
-- 
cgit v1.1


From c7383688466ec61623c709800486de90240fc2d7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 07:25:46 -0700
Subject: Revert "More debug mantis #6625"

This reverts commit 20f2cf876982b2c7589b67ce4c8f09d8fff3e9f1.
---
 OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
index 1e6ff7e..b1dd84e 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServicesConnector.cs
@@ -112,7 +112,6 @@ namespace OpenSim.Services.Connectors.Friends
 
             try
             {
-                m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Calling {0}", uri);
                 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
                 if (reply != string.Empty)
                 {
-- 
cgit v1.1