aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-08-13 14:19:59 +0000
committerCharles Krinke2008-08-13 14:19:59 +0000
commit9d93668a0a83fb02595d8e94013eaf313ad82f8f (patch)
tree137c4d14fcb23d76b71664dcfbaecc9c67d8752e
parentMantis#1931. Thank you kindly, Kinoc for a patch that: (diff)
downloadopensim-SC_OLD-9d93668a0a83fb02595d8e94013eaf313ad82f8f.zip
opensim-SC_OLD-9d93668a0a83fb02595d8e94013eaf313ad82f8f.tar.gz
opensim-SC_OLD-9d93668a0a83fb02595d8e94013eaf313ad82f8f.tar.bz2
opensim-SC_OLD-9d93668a0a83fb02595d8e94013eaf313ad82f8f.tar.xz
mantis#1927. Thank you kindly, Leaf for a patch that:
Makes progress on fixing scripts in child prims of attachments not being scheduled for execution.
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ef0a119..3b961a5 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3466,8 +3466,14 @@ namespace OpenSim.Region.Environment.Scenes
3466 SceneObjectPart part = GetSceneObjectPart(localID); 3466 SceneObjectPart part = GetSceneObjectPart(localID);
3467 if (part != null) 3467 if (part != null)
3468 { 3468 {
3469 LLVector3 pos = part.GetWorldPosition(); 3469 // Changed so that child prims of attachments return scriptDanger for their parent, so that
3470 return scriptDanger(part, pos); 3470 // their scripts will actually run.
3471 // -- Leaf, Tue Aug 12 14:17:05 EDT 2008
3472 SceneObjectPart parent = part.ParentGroup.RootPart;
3473 if( parent != null && parent.IsAttachment )
3474 return scriptDanger(parent, parent.GetWorldPosition() );
3475 else
3476 return scriptDanger(part, part.GetWorldPosition() );
3471 } 3477 }
3472 else 3478 else
3473 { 3479 {