OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'avination' into careminster 

Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
avinationmerge
Melanie 2012-10-07 03:12:21 +01:00
parent 9be2d5c77d d5ea203f93
commit 0c5b36a4f7
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -301,8 +301,8 @@ namespace OpenSim.Services.Connectors
bool success = false;
try
{
AsynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0,
delegate(AssetBase a)
AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30);
if (a != null)
{
if (m_Cache != null)
m_Cache.Cache(a);
@ -314,13 +314,18 @@ namespace OpenSim.Services.Connectors
m_AssetHandlers.Remove(id);
}
foreach (AssetRetrievedEx h in handlers)
{
Util.FireAndForget(x =>
{
h.Invoke(a);
});
}
if (handlers != null)
handlers.Clear();
}, m_maxAssetRequestConcurrency);
success = true;
}
}
finally
{
if (!success)