ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-10-28 00:30:55 +01:00
parent f3f794a122 3531f29a6a
commit 42cd27c46a
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
View File

@@ -129,6 +129,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_options = options;
m_repliesRequired = uuids.Count;
// FIXME: This is a really poor way of handling the timeout since it will always leave the original requesting thread
// hanging. Need to restructure so an original request thread waits for a ManualResetEvent on asset received
// so we can properly abort that thread. Or request all assets synchronously, though that would be a more
// radical change
m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT);
m_requestCallbackTimer.AutoReset = false;
m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout);