diff options
| author | Melanie | 2013-03-29 01:52:18 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-29 01:52:18 +0000 |
| commit | abe885b3fed6eda679d1f9c031e260ca2d4a26b2 (patch) | |
| tree | f52a3cf00cd80937b450dda508d4467b1b1e5c4a /OpenSim/Region | |
| parent | Merge commit 'e97567e22740b7161ae1c0fe45c2dcec3abbfd4b' into careminster (diff) | |
| parent | Fix regression tests by making a new NPC always trigger simulator side attach... (diff) | |
| download | opensim-SC-abe885b3fed6eda679d1f9c031e260ca2d4a26b2.zip opensim-SC-abe885b3fed6eda679d1f9c031e260ca2d4a26b2.tar.gz opensim-SC-abe885b3fed6eda679d1f9c031e260ca2d4a26b2.tar.bz2 opensim-SC-abe885b3fed6eda679d1f9c031e260ca2d4a26b2.tar.xz | |
Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 300ddb3..27a9dc3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1096,7 +1096,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1096 | // and it has already rezzed the attachments and started their scripts. | 1096 | // and it has already rezzed the attachments and started their scripts. |
| 1097 | // We do the following only for non-login agents, because their scripts | 1097 | // We do the following only for non-login agents, because their scripts |
| 1098 | // haven't started yet. | 1098 | // haven't started yet. |
| 1099 | if ((TeleportFlags & TeleportFlags.ViaLogin) != 0) | 1099 | if (PresenceType == PresenceType.Npc || (TeleportFlags & TeleportFlags.ViaLogin) != 0) |
| 1100 | { | 1100 | { |
| 1101 | // We leave a 5 second pause before attempting to rez attachments to avoid a clash with | 1101 | // We leave a 5 second pause before attempting to rez attachments to avoid a clash with |
| 1102 | // version 3 viewers that maybe doing their own attachment rezzing related to their current | 1102 | // version 3 viewers that maybe doing their own attachment rezzing related to their current |
| @@ -1109,7 +1109,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1109 | Util.FireAndForget( | 1109 | Util.FireAndForget( |
| 1110 | o => | 1110 | o => |
| 1111 | { | 1111 | { |
| 1112 | if (Util.FireAndForgetMethod != FireAndForgetMethod.None) | 1112 | if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) |
| 1113 | System.Threading.Thread.Sleep(5000); | 1113 | System.Threading.Thread.Sleep(5000); |
| 1114 | 1114 | ||
| 1115 | Scene.AttachmentsModule.RezAttachments(this); | 1115 | Scene.AttachmentsModule.RezAttachments(this); |