Merge branch 'master' into careminster-presence-refactor
commit
dd2d9a68a7
|
@ -2116,15 +2116,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (llVecDist(new LSL_Vector(0,0,0), targetPos) <= 10.0f)
|
LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos);
|
||||||
{
|
part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
|
||||||
part.OffsetPosition = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z);
|
|
||||||
SceneObjectGroup parent = part.ParentGroup;
|
SceneObjectGroup parent = part.ParentGroup;
|
||||||
parent.HasGroupChanged = true;
|
parent.HasGroupChanged = true;
|
||||||
parent.ScheduleGroupForTerseUpdate();
|
parent.ScheduleGroupForTerseUpdate();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public LSL_Vector llGetPos()
|
public LSL_Vector llGetPos()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue