aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-28 22:44:59 +0000
committerJustin Clark-Casey (justincc)2013-03-28 22:44:59 +0000
commit3b377f16b29a6395d73af1cc987cb9abf9935376 (patch)
tree768dbc6b0374bac7cbbc2f9dca52f36b9c95f091 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-3b377f16b29a6395d73af1cc987cb9abf9935376.zip
opensim-SC_OLD-3b377f16b29a6395d73af1cc987cb9abf9935376.tar.gz
opensim-SC_OLD-3b377f16b29a6395d73af1cc987cb9abf9935376.tar.bz2
opensim-SC_OLD-3b377f16b29a6395d73af1cc987cb9abf9935376.tar.xz
Fix regression tests by making a new NPC always trigger simulator side attachment code when created.
Regression from previous commit c2093ccc. Failed because NPCs don't set the ViaLogin flag
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4fb9a1b..3a1e758 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -951,7 +951,7 @@ namespace OpenSim.Region.Framework.Scenes
951 // and it has already rezzed the attachments and started their scripts. 951 // and it has already rezzed the attachments and started their scripts.
952 // We do the following only for non-login agents, because their scripts 952 // We do the following only for non-login agents, because their scripts
953 // haven't started yet. 953 // haven't started yet.
954 if ((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 // We leave a 5 second pause before attempting to rez attachments to avoid a clash with
957 // version 3 viewers that maybe doing their own attachment rezzing related to their current 957 // version 3 viewers that maybe doing their own attachment rezzing related to their current
@@ -964,7 +964,7 @@ namespace OpenSim.Region.Framework.Scenes
964 Util.FireAndForget( 964 Util.FireAndForget(
965 o => 965 o =>
966 { 966 {
967 if (Util.FireAndForgetMethod != FireAndForgetMethod.None) 967 if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None)
968 System.Threading.Thread.Sleep(5000); 968 System.Threading.Thread.Sleep(5000);
969 969
970 Scene.AttachmentsModule.RezAttachments(this); 970 Scene.AttachmentsModule.RezAttachments(this);