summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/newview/llviewerinventory.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index dcd986a5c7..a424e3c15b 100755
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -810,8 +810,13 @@ bool LLViewerInventoryCategory::exportFileLocal(LLFILE* fp) const
bool LLViewerInventoryCategory::acceptItem(LLInventoryItem* inv_item)
{
- bool accept = true;
+ if (!inv_item)
+ {
+ return false;
+ }
+
// Only stock folders have limitation on which item they will accept
+ bool accept = true;
if (getPreferredType() == LLFolderType::FT_MARKETPLACE_STOCK)
{
// If the item is copyable (i.e. non stock) do not accept the drop in a stock folder