aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-02 22:43:24 +0000
committerJustin Clark-Casey (justincc)2012-03-02 22:43:24 +0000
commit089fd61a3b27faa2479f6b56c6d0dc1cf14774a2 (patch)
treeea5ef653f4332b85f98b43cc865f32fe74c79713 /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-089fd61a3b27faa2479f6b56c6d0dc1cf14774a2.zip
opensim-SC-089fd61a3b27faa2479f6b56c6d0dc1cf14774a2.tar.gz
opensim-SC-089fd61a3b27faa2479f6b56c6d0dc1cf14774a2.tar.bz2
opensim-SC-089fd61a3b27faa2479f6b56c6d0dc1cf14774a2.tar.xz
Allow a script to receive events if its root prim is in an area where it's allowed to run rather than checking its own prim.
This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion!
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9bca654..f45a08c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4162,10 +4162,7 @@ namespace OpenSim.Region.Framework.Scenes
4162 // their scripts will actually run. 4162 // their scripts will actually run.
4163 // -- Leaf, Tue Aug 12 14:17:05 EDT 2008 4163 // -- Leaf, Tue Aug 12 14:17:05 EDT 2008
4164 SceneObjectPart parent = part.ParentGroup.RootPart; 4164 SceneObjectPart parent = part.ParentGroup.RootPart;
4165 if (part.ParentGroup.IsAttachment) 4165 return ScriptDanger(parent, parent.GetWorldPosition());
4166 return ScriptDanger(parent, parent.GetWorldPosition());
4167 else
4168 return ScriptDanger(part, part.GetWorldPosition());
4169 } 4166 }
4170 else 4167 else
4171 { 4168 {