Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-06-07 23:34:22 +01:00
67 changed files with 467 additions and 122 deletions

View File

@@ -3948,10 +3948,11 @@ namespace OpenSim.Region.Framework.Scenes
scriptPosTarget target = m_targets[idx];
if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance)
{
at_target = true;
// trigger at_target
if (m_scriptListens_atTarget)
{
at_target = true;
scriptPosTarget att = new scriptPosTarget();
att.targetPos = target.targetPos;
att.tolerance = target.tolerance;