From 6452154b19c6592efaf27e07bbee3bc6bcd3a415 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 11 Jan 2012 16:53:08 -0800 Subject: Correcting logic back to way it was, to make sure invalid objects can not be copied to the outbox --- indra/newview/llinventorybridge.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llinventorybridge.cpp') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index e75ef20c6a..1d7406883c 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1175,8 +1175,9 @@ bool LLInvFVBridge::canListOnMarketplaceNow() const } const LLInventoryObject* obj = getInventoryObject(); + can_list &= (obj != NULL); - if (obj && can_list) + if (can_list) { const LLUUID& object_id = obj->getLinkedUUID(); can_list = object_id.notNull(); -- cgit v1.2.3