Fix another reason for #2218

0.6.0-stable
Homer Horwitz 2008-09-21 17:01:58 +00:00
parent 1a71a3a567
commit 0f020a7cd2
1 changed files with 8 additions and 3 deletions

View File

@ -1220,11 +1220,16 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="part"></param> /// <param name="part"></param>
internal void SendPartTerseUpdate(IClientAPI remoteClient, SceneObjectPart part) internal void SendPartTerseUpdate(IClientAPI remoteClient, SceneObjectPart part)
{ {
if (m_rootPart.UUID == part.UUID) SceneObjectPart rootPart = m_rootPart;
// TODO: that could by caused by some race condition with attachments on sim-crossing
if (rootPart == null) return;
if (rootPart.UUID == part.UUID)
{ {
if (m_rootPart.IsAttachment) if (rootPart.IsAttachment)
{ {
part.SendTerseUpdateToClient(remoteClient, m_rootPart.AttachedPos); part.SendTerseUpdateToClient(remoteClient, rootPart.AttachedPos);
} }
else else
{ {