diff options
| author | Melanie Thielker | 2015-03-24 01:37:14 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2015-03-24 01:37:14 +0100 |
| commit | 752901c5f4d8f7d4c19839d9b053dfded2205f5b (patch) | |
| tree | c2b0a15f3b1512483f33c992ecc7ffa72262c839 /OpenSim/Region | |
| parent | Allow re-setting the region restart timer. Also move restart notifications to (diff) | |
| download | opensim-SC-752901c5f4d8f7d4c19839d9b053dfded2205f5b.zip opensim-SC-752901c5f4d8f7d4c19839d9b053dfded2205f5b.tar.gz opensim-SC-752901c5f4d8f7d4c19839d9b053dfded2205f5b.tar.bz2 opensim-SC-752901c5f4d8f7d4c19839d9b053dfded2205f5b.tar.xz | |
Make attachment rezzing async again for NPC. Doing that sync causes a deadlock
with the script thread.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cd9dcf5..dff582b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1855,7 +1855,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1855 | // Util.FireAndForget( | 1855 | // Util.FireAndForget( |
| 1856 | // o => | 1856 | // o => |
| 1857 | // { | 1857 | // { |
| 1858 | Scene.AttachmentsModule.RezAttachments(this); | 1858 | if (!isNPC) |
| 1859 | Scene.AttachmentsModule.RezAttachments(this); | ||
| 1860 | else | ||
| 1861 | Util.FireAndForget(x => { | ||
| 1862 | Scene.AttachmentsModule.RezAttachments(this); | ||
| 1863 | }); | ||
| 1859 | // }); | 1864 | // }); |
| 1860 | } | 1865 | } |
| 1861 | else | 1866 | else |