aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2012-06-08 15:16:20 +0200
committerMelanie2012-06-08 15:16:20 +0200
commit21c3cf3dc3ac1266eeeca09227b316e1bc8b68b9 (patch)
tree6a06c8e3a27902897c9351f05e9275e7257481b2 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentAdd a frame based watchdog function to keyframed motion (diff)
parent*UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending pos... (diff)
downloadopensim-SC-21c3cf3dc3ac1266eeeca09227b316e1bc8b68b9.zip
opensim-SC-21c3cf3dc3ac1266eeeca09227b316e1bc8b68b9.tar.gz
opensim-SC-21c3cf3dc3ac1266eeeca09227b316e1bc8b68b9.tar.bz2
opensim-SC-21c3cf3dc3ac1266eeeca09227b316e1bc8b68b9.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 7568888..8fa7880 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3926,10 +3926,11 @@ namespace OpenSim.Region.Framework.Scenes
3926 scriptPosTarget target = m_targets[idx]; 3926 scriptPosTarget target = m_targets[idx];
3927 if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance) 3927 if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance)
3928 { 3928 {
3929 at_target = true;
3930
3929 // trigger at_target 3931 // trigger at_target
3930 if (m_scriptListens_atTarget) 3932 if (m_scriptListens_atTarget)
3931 { 3933 {
3932 at_target = true;
3933 scriptPosTarget att = new scriptPosTarget(); 3934 scriptPosTarget att = new scriptPosTarget();
3934 att.targetPos = target.targetPos; 3935 att.targetPos = target.targetPos;
3935 att.tolerance = target.tolerance; 3936 att.tolerance = target.tolerance;