aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-04 13:58:22 -0700
committerJohn Hurliman2009-10-04 13:58:22 -0700
commita528e7704c17f9c36223d92d66901edd55aebd91 (patch)
tree94005c18cf63deff1c7f5a04c24d45ac36dc8048
parent* MySQL data tests now pass by fixing a bad fix for a bad cast on the asset L... (diff)
parentJust trying a few things. This one will reduce the number of async calls. (diff)
downloadopensim-SC_OLD-a528e7704c17f9c36223d92d66901edd55aebd91.zip
opensim-SC_OLD-a528e7704c17f9c36223d92d66901edd55aebd91.tar.gz
opensim-SC_OLD-a528e7704c17f9c36223d92d66901edd55aebd91.tar.bz2
opensim-SC_OLD-a528e7704c17f9c36223d92d66901edd55aebd91.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index d16112d..b1d41da 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -183,7 +183,8 @@ namespace OpenSim.Services.Connectors
183 } 183 }
184 else 184 else
185 { 185 {
186 Util.FireAndForget(delegate { handler(id, sender, asset); }); 186 //Util.FireAndForget(delegate { handler(id, sender, asset); });
187 handler(id, sender, asset);
187 } 188 }
188 189
189 return true; 190 return true;