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 3a1e758..fcb2f6d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -953,13 +953,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
953 | // haven't started yet. | 953 | // haven't started yet. |
954 | if (PresenceType == PresenceType.Npc || (TeleportFlags & TeleportFlags.ViaLogin) != 0) | 954 | if (PresenceType == PresenceType.Npc || (TeleportFlags & TeleportFlags.ViaLogin) != 0) |
955 | { | 955 | { |
956 | // We leave a 5 second pause before attempting to rez attachments to avoid a clash with | 956 | // Viewers which have a current outfit folder will actually rez their own attachments. However, |
957 | // version 3 viewers that maybe doing their own attachment rezzing related to their current | 957 | // viewers without (e.g. v1 viewers) will not, so we still need to make this call. |
958 | // outfit folder on startup. If these operations do clash, then the symptoms are invisible | 958 | // |
959 | // attachments until one zooms in on the avatar. | 959 | // However, we leave a 5 second pause to try and avoid a clash with viewers that are rezzing |
960 | // | 960 | // attachments themselves. This should then mean that this call ends up doing nothing. |
961 | // We do not pause if we are launching on the same thread anyway in order to avoid pointlessly | ||
962 | // delaying any attachment related regression tests. | ||
963 | if (Scene.AttachmentsModule != null) | 961 | if (Scene.AttachmentsModule != null) |
964 | Util.FireAndForget( | 962 | Util.FireAndForget( |
965 | o => | 963 | o => |