ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vehicles

Browse Source
This commit is contained in:
Melanie
2009-10-15 21:14:13 +01:00
parent 70553a979e fe4109a5b0
commit 6deef7d0f3
63 changed files with 2254 additions and 1996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1241,6 +1241,7 @@ namespace OpenSim.Region.Framework.Scenes
{
lock (m_targets)
m_targets.Clear();
m_scene.RemoveGroupTarget(this);
}
ScheduleGroupForFullUpdate();
@@ -1871,12 +1872,6 @@ namespace OpenSim.Region.Framework.Scenes
m_rootPart.UpdateFlag = 1;
lastPhysGroupPos = AbsolutePosition;
}
//foreach (SceneObjectPart part in m_parts.Values)
//{
//if (part.UpdateFlag == 0) part.UpdateFlag = 1;
//}
checkAtTargets();
if (UsePhysics && ((Math.Abs(lastPhysGroupRot.W - GroupRotation.W) > 0.1)
|| (Math.Abs(lastPhysGroupRot.X - GroupRotation.X) > 0.1)
@@ -3126,6 +3121,7 @@ namespace OpenSim.Region.Framework.Scenes
{
m_targets.Add(handle, waypoint);
}
m_scene.AddGroupTarget(this);
return (int)handle;
}
@@ -3133,12 +3129,13 @@ namespace OpenSim.Region.Framework.Scenes
{
lock (m_targets)
{
if (m_targets.ContainsKey((uint)handle))
m_targets.Remove((uint)handle);
m_targets.Remove((uint)handle);
if (m_targets.Count == 0)
m_scene.RemoveGroupTarget(this);
}
}
private void checkAtTargets()
public void checkAtTargets()
{
if (m_scriptListens_atTarget || m_scriptListens_notAtTarget)
{