diff options
author | Melanie | 2012-02-23 14:08:35 +0100 |
---|---|---|
committer | Melanie | 2012-02-23 14:08:35 +0100 |
commit | dc835717d66678eddfd802717a068c6131e460fc (patch) | |
tree | 82a8ce6b5bccda6e959fcd541cf81a67f7ba8c17 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'ubitwork' (diff) | |
download | opensim-SC_OLD-dc835717d66678eddfd802717a068c6131e460fc.zip opensim-SC_OLD-dc835717d66678eddfd802717a068c6131e460fc.tar.gz opensim-SC_OLD-dc835717d66678eddfd802717a068c6131e460fc.tar.bz2 opensim-SC_OLD-dc835717d66678eddfd802717a068c6131e460fc.tar.xz |
Properly sequence updates of avatars and attachments so that we don't
update attachments on child avatars or intermingle agent and attachment
updates, which would render the root prim of huds invisible
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a3839c2..2c118d6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -984,6 +984,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
984 | Util.FireAndForget(delegate(object x) { | 984 | Util.FireAndForget(delegate(object x) { |
985 | foreach (SceneObjectGroup sog in m_attachments) | 985 | foreach (SceneObjectGroup sog in m_attachments) |
986 | { | 986 | { |
987 | sog.ScheduleGroupForFullUpdate(); | ||
987 | sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); | 988 | sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); |
988 | sog.ResumeScripts(); | 989 | sog.ResumeScripts(); |
989 | } | 990 | } |
@@ -991,6 +992,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
991 | } | 992 | } |
992 | } | 993 | } |
993 | 994 | ||
995 | SendAvatarDataToAllAgents(); | ||
996 | |||
994 | // send the animations of the other presences to me | 997 | // send the animations of the other presences to me |
995 | m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) | 998 | m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) |
996 | { | 999 | { |