aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-27 02:50:58 +0100
committerJustin Clark-Casey (justincc)2011-10-27 02:50:58 +0100
commite210d958219d0c400544f849202279c78feeea9d (patch)
tree4051f7fa4d34ca3dfbc7c508d830bfd64bf41396
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-e210d958219d0c400544f849202279c78feeea9d.zip
opensim-SC_OLD-e210d958219d0c400544f849202279c78feeea9d.tar.gz
opensim-SC_OLD-e210d958219d0c400544f849202279c78feeea9d.tar.bz2
opensim-SC_OLD-e210d958219d0c400544f849202279c78feeea9d.tar.xz
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
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7affa45..9f24ee7 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1958,8 +1958,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1958 SendBulkUpdateInventoryItem((InventoryItemBase)node); 1958 SendBulkUpdateInventoryItem((InventoryItemBase)node);
1959 else if (node is InventoryFolderBase) 1959 else if (node is InventoryFolderBase)
1960 SendBulkUpdateInventoryFolder((InventoryFolderBase)node); 1960 SendBulkUpdateInventoryFolder((InventoryFolderBase)node);
1961 else if (node != null)
1962 m_log.ErrorFormat("[CLIENT]: {0} sent unknown inventory node named {1}", Name, node.Name);
1961 else 1963 else
1962 m_log.ErrorFormat("[CLIENT]: Client for {0} sent unknown inventory node named {1}", Name, node.Name); 1964 m_log.ErrorFormat("[CLIENT]: {0} sent null inventory node", Name);
1963 } 1965 }
1964 1966
1965 protected void SendBulkUpdateInventoryItem(InventoryItemBase item) 1967 protected void SendBulkUpdateInventoryItem(InventoryItemBase item)