Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

2011-04-26 23:41:57 +01:00 · 2011-04-26 23:41:57 +01:00 · 57efed988c
parent a6c53b1ba2 4ed54dcc01
commit 57efed988c
1 changed files with 4 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -4035,6 +4035,10 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity;     // add for ju
        {
            lock (m_attachments)
            {
+                // This may be true when the attachment comes back
+                // from serialization after login. Clear it.
+                gobj.IsDeleted = false;
+
                m_attachments.Add(gobj);
            }
        }