diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-26 23:03:10 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-26 23:03:10 -0500 |
| commit | babdb7c209b182cebaa13e2e4800b11d8036f483 (patch) | |
| tree | 05ad55aa9761abb4a07d006a6fba493b1ef3dbcd /indra/newview/llpreview.cpp | |
| parent | a6da63020729f5e1f2163442fba69a46b04a9289 (diff) | |
| parent | 0c0b66388fddb70c4e9ac7660ba5dd709bc4cfc9 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index fc2de4844e..b9b2279e77 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -115,8 +115,11 @@ const LLInventoryItem *LLPreview::getItem() const } else if (mObjectUUID.isNull()) { - // it's an inventory item, so get the item. - item = gInventory.getItem(mItemUUID); + if (mItemUUID.notNull()) + { + // it's an inventory item, so get the item. + item = gInventory.getItem(mItemUUID); + } } else { |