1 files changed, 11 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cd630b8..5faa764 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2259,7 +2259,17 @@ namespace OpenSim.Region.Framework.Scenes
                 if (IsNPC || IsRealLogin(m_teleportFlags))
                 {
                     if (Scene.AttachmentsModule != null)
-                        Scene.AttachmentsModule.RezAttachments(this);
+                     {
+                        if(IsNPC)
+                        {
+                            Util.FireAndForget(x =>
+                                {
+                                    Scene.AttachmentsModule.RezAttachments(this);
+                                });
+                        }
+                        else
+                            Scene.AttachmentsModule.RezAttachments(this);
+                    }
                 }
                 else
                 {