aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset
diff options
context:
space:
mode:
authorMelanie2009-10-05 00:23:47 +0100
committerMelanie2009-10-05 00:23:47 +0100
commita208f33c5dc4784f97dc3cd46cb56e79cc457f82 (patch)
tree64bd2e48db8b417e1df92566c56a55bc3c9e4786 /OpenSim/Services/Connectors/Asset
parent* KeepAlive set to false in expect_user and log_off. (diff)
downloadopensim-SC_OLD-a208f33c5dc4784f97dc3cd46cb56e79cc457f82.zip
opensim-SC_OLD-a208f33c5dc4784f97dc3cd46cb56e79cc457f82.tar.gz
opensim-SC_OLD-a208f33c5dc4784f97dc3cd46cb56e79cc457f82.tar.bz2
opensim-SC_OLD-a208f33c5dc4784f97dc3cd46cb56e79cc457f82.tar.xz
Make the asset connector async Get overload return false if the asset
retrieval was not synchronous.
Diffstat (limited to 'OpenSim/Services/Connectors/Asset')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index b1d41da..6f7c90f 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -171,6 +171,8 @@ namespace OpenSim.Services.Connectors
171 171
172 if (asset == null) 172 if (asset == null)
173 { 173 {
174 bool result = false;
175
174 AsynchronousRestObjectRequester. 176 AsynchronousRestObjectRequester.
175 MakeRequest<int, AssetBase>("GET", uri, 0, 177 MakeRequest<int, AssetBase>("GET", uri, 0,
176 delegate(AssetBase a) 178 delegate(AssetBase a)
@@ -178,8 +180,10 @@ namespace OpenSim.Services.Connectors
178 if (m_Cache != null) 180 if (m_Cache != null)
179 m_Cache.Cache(a); 181 m_Cache.Cache(a);
180 handler(id, sender, a); 182 handler(id, sender, a);
183 result = true;
181 }); 184 });
182 185
186 return result;
183 } 187 }
184 else 188 else
185 { 189 {