aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorCasperW2009-11-23 19:51:40 +0100
committerCasperW2009-11-23 19:51:40 +0100
commit73c2162ff60850d96761aa07a1950dbbb2ec3e80 (patch)
treeabdd139ca4d5b6e3588f56c7b21f6c82867fee8e /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentAdded some [DebuggerNonUserCode] modifiers to functions that throw EventAbort... (diff)
downloadopensim-SC-73c2162ff60850d96761aa07a1950dbbb2ec3e80.zip
opensim-SC-73c2162ff60850d96761aa07a1950dbbb2ec3e80.tar.gz
opensim-SC-73c2162ff60850d96761aa07a1950dbbb2ec3e80.tar.bz2
opensim-SC-73c2162ff60850d96761aa07a1950dbbb2ec3e80.tar.xz
Fixed nullrefs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 66fb918..83208e9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -840,8 +840,12 @@ namespace OpenSim.Region.Framework.Scenes
840 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID) 840 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID)
841 { 841 {
842 SceneObjectPart part = GetSceneObjectPart(localID); 842 SceneObjectPart part = GetSceneObjectPart(localID);
843 SceneObjectGroup group = part.ParentGroup; 843 SceneObjectGroup group = null;
844 if (group != null) 844 if (part != null)
845 {
846 group = part.ParentGroup;
847 }
848 if (part != null && group != null)
845 { 849 {
846 TaskInventoryItem item = group.GetInventoryItem(localID, itemID); 850 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
847 if (item == null) 851 if (item == null)