aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-20 02:09:25 +0000
committerJustin Clark-Casey (justincc)2013-03-20 02:09:25 +0000
commit8de933ab07a0f9e8291d705a9a03d5b1ba60caa9 (patch)
tree4e1b1a6ac02abba058ec743e0265f4bd4ca0cfd6 /OpenSim
parentFix "show attachments" command probably broken in commit addab12 (Wed Jan 2 2... (diff)
downloadopensim-SC-8de933ab07a0f9e8291d705a9a03d5b1ba60caa9.zip
opensim-SC-8de933ab07a0f9e8291d705a9a03d5b1ba60caa9.tar.gz
opensim-SC-8de933ab07a0f9e8291d705a9a03d5b1ba60caa9.tar.bz2
opensim-SC-8de933ab07a0f9e8291d705a9a03d5b1ba60caa9.tar.xz
Insert a short delay on the simulator side rezzing of attachments in order to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions.
This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar. This doesn't affect version 1 viewers since this delay is shorter than the login delay. This doesn't increase the login time since this part of the process was already being performed asynchronously. This may be a temporary solution.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3c91c5b..89eca32 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2832,7 +2832,7 @@ namespace OpenSim.Region.Framework.Scenes
2832 sp.IsChildAgent = false; 2832 sp.IsChildAgent = false;
2833 2833
2834 if (AttachmentsModule != null) 2834 if (AttachmentsModule != null)
2835 Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); }); 2835 Util.FireAndForget(o => { Thread.Sleep(5000); AttachmentsModule.RezAttachments(sp); });
2836 } 2836 }
2837 } 2837 }
2838 else 2838 else