aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-20 23:12:13 +0000
committerJustin Clark-Casey (justincc)2013-03-20 23:12:13 +0000
commitb1cd1d917e25e34c2efda65ab52164269863da87 (patch)
tree265641497e27f977bec9d3cb7a45bc5c5c264798
parentAdd file missing from last commit 36651be (diff)
downloadopensim-SC_OLD-b1cd1d917e25e34c2efda65ab52164269863da87.zip
opensim-SC_OLD-b1cd1d917e25e34c2efda65ab52164269863da87.tar.gz
opensim-SC_OLD-b1cd1d917e25e34c2efda65ab52164269863da87.tar.bz2
opensim-SC_OLD-b1cd1d917e25e34c2efda65ab52164269863da87.tar.xz
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.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 89eca32..c9c0662 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2831,8 +2831,22 @@ namespace OpenSim.Region.Framework.Scenes
2831 // XXX: This is convoluted. 2831 // XXX: This is convoluted.
2832 sp.IsChildAgent = false; 2832 sp.IsChildAgent = false;
2833 2833
2834 // We leave a 5 second pause before attempting to rez attachments to avoid a clash with
2835 // version 3 viewers that maybe doing their own attachment rezzing related to their current
2836 // outfit folder on startup. If these operations do clash, then the symptoms are invisible
2837 // attachments until one zooms in on the avatar.
2838 //
2839 // We do not pause if we are launching on the same thread anyway in order to avoid pointlessly
2840 // delaying any attachment related regression tests.
2834 if (AttachmentsModule != null) 2841 if (AttachmentsModule != null)
2835 Util.FireAndForget(o => { Thread.Sleep(5000); AttachmentsModule.RezAttachments(sp); }); 2842 Util.FireAndForget(
2843 o =>
2844 {
2845 if (Util.FireAndForgetMethod != FireAndForgetMethod.None)
2846 Thread.Sleep(5000);
2847
2848 AttachmentsModule.RezAttachments(sp);
2849 });
2836 } 2850 }
2837 } 2851 }
2838 else 2852 else