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

minor: don't bother with the pause before rezzing attachments if we are running regression tests (fire and forget calls launched on the same thread). 

Also adds code comments as to why this pause exists.
user_profiles
Justin Clark-Casey (justincc) 2013-03-20 23:12:13 +00:00
parent 16af5b87f8
commit b1cd1d917e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2831,8 +2831,22 @@ namespace OpenSim.Region.Framework.Scenes
// XXX: This is convoluted. // XXX: This is convoluted.
sp.IsChildAgent = false; sp.IsChildAgent = false;
// We leave a 5 second pause before attempting to rez attachments to avoid a clash with
// version 3 viewers that maybe doing their own attachment rezzing related to their current
// outfit folder on startup. If these operations do clash, then the symptoms are invisible
// attachments until one zooms in on the avatar.
//
// We do not pause if we are launching on the same thread anyway in order to avoid pointlessly
// delaying any attachment related regression tests.
if (AttachmentsModule != null) if (AttachmentsModule != null)
Util.FireAndForget(o => { Thread.Sleep(5000); AttachmentsModule.RezAttachments(sp); }); Util.FireAndForget(
o =>
{
if (Util.FireAndForgetMethod != FireAndForgetMethod.None)
Thread.Sleep(5000);
AttachmentsModule.RezAttachments(sp);
});
} }
} }
else else