OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster

avinationmerge
Melanie 2013-03-29 01:52:18 +00:00
parent b82936245b 3b377f16b2
commit abe885b3fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1096,7 +1096,7 @@ namespace OpenSim.Region.Framework.Scenes
// and it has already rezzed the attachments and started their scripts. // and it has already rezzed the attachments and started their scripts.
// We do the following only for non-login agents, because their scripts // We do the following only for non-login agents, because their scripts
// haven't started yet. // haven't started yet.
if ((TeleportFlags & TeleportFlags.ViaLogin) != 0) if (PresenceType == PresenceType.Npc || (TeleportFlags & TeleportFlags.ViaLogin) != 0)
{ {
// We leave a 5 second pause before attempting to rez attachments to avoid a clash with // We leave a 5 second pause before attempting to rez attachments to avoid a clash with
// version 3 viewers that maybe doing their own attachment rezzing related to their current // version 3 viewers that maybe doing their own attachment rezzing related to their current
@ -1109,7 +1109,7 @@ namespace OpenSim.Region.Framework.Scenes
Util.FireAndForget( Util.FireAndForget(
o => o =>
{ {
if (Util.FireAndForgetMethod != FireAndForgetMethod.None) if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None)
System.Threading.Thread.Sleep(5000); System.Threading.Thread.Sleep(5000);
Scene.AttachmentsModule.RezAttachments(this); Scene.AttachmentsModule.RezAttachments(this);