aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4930a39..215a689 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -955,15 +955,12 @@ namespace OpenSim.Region.Framework.Scenes
955 { 955 {
956 // Viewers which have a current outfit folder will actually rez their own attachments. However, 956 // Viewers which have a current outfit folder will actually rez their own attachments. However,
957 // viewers without (e.g. v1 viewers) will not, so we still need to make this call. 957 // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
958 //
959 // However, we leave a 5 second pause to try and avoid a clash with viewers that are rezzing
960 // attachments themselves. This should then mean that this call ends up doing nothing.
961 if (Scene.AttachmentsModule != null) 958 if (Scene.AttachmentsModule != null)
962 Util.FireAndForget( 959 Util.FireAndForget(
963 o => 960 o =>
964 { 961 {
965 if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 962// if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None)
966 System.Threading.Thread.Sleep(5000); 963// System.Threading.Thread.Sleep(7000);
967 964
968 Scene.AttachmentsModule.RezAttachments(this); 965 Scene.AttachmentsModule.RezAttachments(this);
969 }); 966 });