diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 56b2f13..a5296eb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2479,7 +2479,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2479 | //m_log.Debug("prev: " + prevflag.ToString() + " curr: " + Flags.ToString()); | 2479 | //m_log.Debug("prev: " + prevflag.ToString() + " curr: " + Flags.ToString()); |
2480 | //ScheduleFullUpdate(); | 2480 | //ScheduleFullUpdate(); |
2481 | } | 2481 | } |
2482 | 2482 | ||
2483 | public void RemoveScriptEvents(UUID scriptid) | 2483 | public void RemoveScriptEvents(UUID scriptid) |
2484 | { | 2484 | { |
2485 | lock (m_scriptEvents) | 2485 | lock (m_scriptEvents) |
@@ -2533,6 +2533,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2533 | /// </summary> | 2533 | /// </summary> |
2534 | public void ScheduleFullUpdate() | 2534 | public void ScheduleFullUpdate() |
2535 | { | 2535 | { |
2536 | // m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId); | ||
2537 | |||
2536 | if (m_parentGroup != null) | 2538 | if (m_parentGroup != null) |
2537 | { | 2539 | { |
2538 | m_parentGroup.QueueForUpdateCheck(); | 2540 | m_parentGroup.QueueForUpdateCheck(); |
@@ -4042,6 +4044,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4042 | 4044 | ||
4043 | if (m_parentGroup == null) | 4045 | if (m_parentGroup == null) |
4044 | { | 4046 | { |
4047 | // m_log.DebugFormat( | ||
4048 | // "[SCENE OBJECT PART]: Scheduling part {0} {1} for full update in aggregateScriptEvents() since m_parentGroup == null", Name, LocalId); | ||
4045 | ScheduleFullUpdate(); | 4049 | ScheduleFullUpdate(); |
4046 | return; | 4050 | return; |
4047 | } | 4051 | } |
@@ -4058,9 +4062,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
4058 | LocalFlags=(PrimFlags)objectflagupdate; | 4062 | LocalFlags=(PrimFlags)objectflagupdate; |
4059 | 4063 | ||
4060 | if (m_parentGroup != null && m_parentGroup.RootPart == this) | 4064 | if (m_parentGroup != null && m_parentGroup.RootPart == this) |
4065 | { | ||
4061 | m_parentGroup.aggregateScriptEvents(); | 4066 | m_parentGroup.aggregateScriptEvents(); |
4067 | } | ||
4062 | else | 4068 | else |
4069 | { | ||
4070 | // m_log.DebugFormat( | ||
4071 | // "[SCENE OBJECT PART]: Scheduling part {0} {1} for full update in aggregateScriptEvents()", Name, LocalId); | ||
4063 | ScheduleFullUpdate(); | 4072 | ScheduleFullUpdate(); |
4073 | } | ||
4064 | } | 4074 | } |
4065 | 4075 | ||
4066 | public int registerTargetWaypoint(Vector3 target, float tolerance) | 4076 | public int registerTargetWaypoint(Vector3 target, float tolerance) |