aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-05 17:38:27 -0700
committerJohn Hurliman2009-10-05 17:38:27 -0700
commit7ddb6fbced5f2a98aa0201e354987ebc32adf7d2 (patch)
tree903b87112e7f851218e7b3d41c681f1b8f512af2 /OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
parentBeginning work on the new LLUDP implementation (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.zip
opensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.tar.gz
opensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.tar.bz2
opensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs')
-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 {