Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
commit
57efed988c
|
@ -4035,6 +4035,10 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
|
||||||
{
|
{
|
||||||
lock (m_attachments)
|
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);
|
m_attachments.Add(gobj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue