1 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 92d0aff..6b031ae 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2990,8 +2990,22 @@ namespace OpenSim.Region.Framework.Scenes
                         sp.IsChildAgent = false;
                         sp.IsLoggingIn = true;
     
+                        // 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)
-                            Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); });
+                            Util.FireAndForget(
+                                o => 
+                                { 
+                                    if (Util.FireAndForgetMethod != FireAndForgetMethod.None) 
+                                        Thread.Sleep(5000); 
+
+                                    AttachmentsModule.RezAttachments(sp); 
+                                });
                     }
                 }
                 else