aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-03-29 02:21:38 +0000
committerJustin Clark-Casey (justincc)2013-03-29 02:21:38 +0000
commit23ae4c0a4d813763bcc39db7693850a21727d7f2 (patch)
treec1707918586c71aba48e282ffcd53f0df8cf6e60 /OpenSim/Region/Framework/Scenes/Scene.cs
parentRevert "Try eliminating the pause before auto-reteleporting for a megaregion ... (diff)
downloadopensim-SC_OLD-23ae4c0a4d813763bcc39db7693850a21727d7f2.zip
opensim-SC_OLD-23ae4c0a4d813763bcc39db7693850a21727d7f2.tar.gz
opensim-SC_OLD-23ae4c0a4d813763bcc39db7693850a21727d7f2.tar.bz2
opensim-SC_OLD-23ae4c0a4d813763bcc39db7693850a21727d7f2.tar.xz
Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments.
This was because the script resumption in AttachmentsModule was firing the attach event instead. Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal. This is to resolve http://opensimulator.org/mantis/view.php?id=6578
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5337835..911a3e4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2739,7 +2739,10 @@ namespace OpenSim.Region.Framework.Scenes
2739// "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); 2739// "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
2740 2740
2741 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2741 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2742 2742
2743 // We must currently not resume scripts at this stage since AttachmentsModule does not have the
2744 // information that this is due to a teleport/border cross rather than an ordinary attachment.
2745 // We currently do this in Scene.MakeRootAgent() instead.
2743 if (AttachmentsModule != null) 2746 if (AttachmentsModule != null)
2744 AttachmentsModule.AttachObject(sp, grp, 0, false, false, true); 2747 AttachmentsModule.AttachObject(sp, grp, 0, false, false, true);
2745 } 2748 }