Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly passed a null node reference.

Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-27 02:50:58 +01:00
parent 2db6a8ce8f
commit e210d95821
1 changed files with 3 additions and 1 deletions

View File

@ -1958,8 +1958,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SendBulkUpdateInventoryItem((InventoryItemBase)node); SendBulkUpdateInventoryItem((InventoryItemBase)node);
else if (node is InventoryFolderBase) else if (node is InventoryFolderBase)
SendBulkUpdateInventoryFolder((InventoryFolderBase)node); SendBulkUpdateInventoryFolder((InventoryFolderBase)node);
else if (node != null)
m_log.ErrorFormat("[CLIENT]: {0} sent unknown inventory node named {1}", Name, node.Name);
else else
m_log.ErrorFormat("[CLIENT]: Client for {0} sent unknown inventory node named {1}", Name, node.Name); m_log.ErrorFormat("[CLIENT]: {0} sent null inventory node", Name);
} }
protected void SendBulkUpdateInventoryItem(InventoryItemBase item) protected void SendBulkUpdateInventoryItem(InventoryItemBase item)