Merge branch 'VWR-2003' into nicholaz-patches

2 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 057bc07..e51ab99 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -9,6 +9,9 @@
         * linden/indra/newview/llviewerobjectlist.cpp (killObjects): 
         Ditto.
 
+        * linden/indra/newview/lltooldraganddrop.cpp (dragOrDrop): 
+        VWR-2003: Possible crash in lltooldraganddrop.cpp.
+
 2008-09-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/lltexturecache.cpp (purgeTextureFilesTimeSliced):
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],