From 752901c5f4d8f7d4c19839d9b053dfded2205f5b Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 24 Mar 2015 01:37:14 +0100
Subject: [PATCH] Make attachment rezzing async again for NPC. Doing that sync
 causes a deadlock with the script thread.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cd9dcf58fc..dff582b8c3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1855,7 +1855,12 @@ namespace OpenSim.Region.Framework.Scenes
                         // Util.FireAndForget(
                         //      o =>
                         //      {
-                            Scene.AttachmentsModule.RezAttachments(this);
+                            if (!isNPC)
+                                Scene.AttachmentsModule.RezAttachments(this);
+                            else
+                                Util.FireAndForget(x => {
+                                    Scene.AttachmentsModule.RezAttachments(this);
+                                });
                         // });
                     }
                     else