aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs12
2 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 46daab3..156a09d 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -53,6 +53,10 @@ namespace OpenSim.Region.Framework.Interfaces
53 /// RezAttachments. This should only be called upon login on the first region. 53 /// RezAttachments. This should only be called upon login on the first region.
54 /// Attachment rezzings on crossings and TPs are done in a different way. 54 /// Attachment rezzings on crossings and TPs are done in a different way.
55 /// </summary> 55 /// </summary>
56 /// <remarks>
57 /// This is only actually necessary for viewers which do not have a current outfit folder (these viewers make
58 /// their own attachment calls on login) and agents which have attachments but no viewer (e.g. NPCs).
59 /// </remarks>
56 /// <param name="sp"></param> 60 /// <param name="sp"></param>
57 void RezAttachments(IScenePresence sp); 61 void RezAttachments(IScenePresence sp);
58 62
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 =>