diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 16:53:08 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 16:53:08 -0800 |
| commit | 6452154b19c6592efaf27e07bbee3bc6bcd3a415 (patch) | |
| tree | f6fdbea6839de2b7264f3c5f9291498345857c71 /indra | |
| parent | f7c507e473579563e29d276b83b31eb0f18ce296 (diff) | |
Correcting logic back to way it was, to make sure invalid objects can not be copied to the outbox
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |