From 5c920015e999cfe9860e769105632891db3e1916 Mon Sep 17 00:00:00 2001
From: Nicholaz Beresford
Date: Wed, 17 Sep 2008 01:49:35 -0500
Subject: VWR-2003: Possible crash in lltooldraganddrop.cpp.

---
 ChangeLog.txt                              | 4 ++++
 linden/indra/newview/lltooldraganddrop.cpp | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index e69de29..376a749 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -0,0 +1,4 @@
+2008-09-17  Nicholaz Beresford  <nicholaz@blueflash.cc>
+
+	* linden/indra/newview/lltooldraganddrop.cpp (dragOrDrop): 
+	VWR-2003: Possible crash in lltooldraganddrop.cpp.
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index c492c7b..7a378a9 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -929,6 +929,12 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
 		{
 			LLInventoryObject* cargo = locateInventory(item, cat);
 
+			if (!cargo) 
+			{
+				handled = FALSE;
+				break;
+			}
+
 			EAcceptance item_acceptance = ACCEPT_NO;
 			handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE,
 												mCargoTypes[mCurItemIndex],
-- 
cgit v1.1