From 37feae82998ad7373a354d9b8c295001b9befc9a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 29 Dec 2014 14:42:31 -0800
Subject: Fix for potential crash on exit

---
 indra/newview/llviewerinventory.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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
-- 
cgit v1.2.3