diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 27a9dc3..486a075 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1098,13 +1098,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1098 | // haven't started yet. | 1098 | // haven't started yet. |
1099 | if (PresenceType == PresenceType.Npc || (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 | // Viewers which have a current outfit folder will actually rez their own attachments. However, |
1102 | // version 3 viewers that maybe doing their own attachment rezzing related to their current | 1102 | // viewers without (e.g. v1 viewers) will not, so we still need to make this call. |
1103 | // outfit folder on startup. If these operations do clash, then the symptoms are invisible | 1103 | // |
1104 | // attachments until one zooms in on the avatar. | 1104 | // However, we leave a 5 second pause to try and avoid a clash with viewers that are rezzing |
1105 | // | 1105 | // attachments themselves. This should then mean that this call ends up doing nothing. |
1106 | // We do not pause if we are launching on the same thread anyway in order to avoid pointlessly | ||
1107 | // delaying any attachment related regression tests. | ||
1108 | if (Scene.AttachmentsModule != null) | 1106 | if (Scene.AttachmentsModule != null) |
1109 | Util.FireAndForget( | 1107 | Util.FireAndForget( |
1110 | o => | 1108 | o => |