Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

2009-11-25 11:21:47 -05:00 · 2009-11-25 11:21:47 -05:00 · 5f7503b252
parent 41eb231e6a c5ef834606
commit 5f7503b252
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@ -2769,7 +2769,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
 										BOOL drop)
 {
 	LLInventoryModel* model = getInventoryModel();
-	if(!model) return FALSE;
+	if(!model || !inv_item) return FALSE;

 	// cannot drag into library
 	if(!isAgentInventory())