aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-21 23:41:48 +0000
committerJustin Clark-Casey (justincc)2012-02-21 23:41:48 +0000
commitcf9b3e7708f0cf58c94fcfd76974733c37ac0d1c (patch)
tree4ff29f420ab76fb88323c8aa5687dc22423bb7f0 /OpenSim
parentFix:LINK_ROOT flag for llGetLinkName() by SinglePrim (diff)
downloadopensim-SC_OLD-cf9b3e7708f0cf58c94fcfd76974733c37ac0d1c.zip
opensim-SC_OLD-cf9b3e7708f0cf58c94fcfd76974733c37ac0d1c.tar.gz
opensim-SC_OLD-cf9b3e7708f0cf58c94fcfd76974733c37ac0d1c.tar.bz2
opensim-SC_OLD-cf9b3e7708f0cf58c94fcfd76974733c37ac0d1c.tar.xz
Restore the taskItem null check that I accidentally blatted in 5397a6d
This is a valid check because the caller could supply an invalid uuid.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 83e3a45..23f39a8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1146,6 +1146,15 @@ namespace OpenSim.Region.Framework.Scenes
1146 1146
1147 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId); 1147 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
1148 1148
1149 if (null == taskItem)
1150 {
1151 m_log.WarnFormat("[PRIM INVENTORY]: Move of inventory item {0} from prim with local id {1} failed"
1152 + " because the inventory item could not be found",
1153 itemId, primLocalId);
1154
1155 return;
1156 }
1157
1149 if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 1158 if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1150 { 1159 {
1151 // If the item to be moved is no copy, we need to be able to 1160 // If the item to be moved is no copy, we need to be able to