Make attachment rezzing async again for NPC. Doing that sync causes a deadlock

with the script thread.
2015-03-24 01:37:14 +01:00 · 2015-03-24 01:37:14 +01:00 · 752901c5f4
parent 65c0c4be78
commit 752901c5f4
1 changed files with 6 additions and 1 deletions
--- 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 =>
                        //      {
+                            if (!isNPC)
                                Scene.AttachmentsModule.RezAttachments(this);
+                            else
+                                Util.FireAndForget(x => {
+                                    Scene.AttachmentsModule.RezAttachments(this);
+                                });
                        // });
                    }
                    else