OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' into avination

avinationmerge
Melanie 2013-01-16 23:37:27 +01:00
parent 3e0e9a0962 de49440839
commit 777c80becb
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2369,6 +2369,8 @@ namespace OpenSim.Region.Framework.Scenes
if (pa != null)
pa.PIDActive = false;
RootPart.ScheduleTerseUpdate(); // send a stop information
}
public void rotLookAt(Quaternion target, float strength, float damping)

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -3760,7 +3760,7 @@ namespace OpenSim.Region.Framework.Scenes
{
ParentGroup.stopMoveToTarget();
ParentGroup.ScheduleGroupForTerseUpdate();
// ParentGroup.ScheduleGroupForTerseUpdate();
//ParentGroup.ScheduleGroupForFullUpdate();
}

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2309,9 +2309,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else
{
part.OffsetPosition = (Vector3)toPos;
SceneObjectGroup parent = part.ParentGroup;
parent.HasGroupChanged = true;
parent.ScheduleGroupForTerseUpdate();
// SceneObjectGroup parent = part.ParentGroup;
// parent.HasGroupChanged = true;
// parent.ScheduleGroupForTerseUpdate();
part.ScheduleTerseUpdate();
}
}
@ -8341,9 +8342,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else
{
part.OffsetPosition = currentPosition;
SceneObjectGroup parent = part.ParentGroup;
parent.HasGroupChanged = true;
parent.ScheduleGroupForTerseUpdate();
// SceneObjectGroup parent = part.ParentGroup;
// parent.HasGroupChanged = true;
// parent.ScheduleGroupForTerseUpdate();
part.ScheduleTerseUpdate();
}
}
}