Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

prebuild-update
Diva Canto 2010-07-30 18:07:50 -07:00
commit ed59dcd422
1 changed files with 5 additions and 7 deletions

View File

@ -1934,13 +1934,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
else
{
if (llVecDist(new LSL_Vector(0,0,0), targetPos) <= 10.0f)
{
part.OffsetPosition = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z);
SceneObjectGroup parent = part.ParentGroup;
parent.HasGroupChanged = true;
parent.ScheduleGroupForTerseUpdate();
}
LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos);
part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
SceneObjectGroup parent = part.ParentGroup;
parent.HasGroupChanged = true;
parent.ScheduleGroupForTerseUpdate();
}
}