summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-25 11:21:08 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-25 11:21:08 -0500
commitc5ef834606b272ad4d10ee73b916773dc7fa66d3 (patch)
treed794eb1e2091ecde3aa7c3087e461e814eacb63b /indra/newview
parent07a396e3119af7dd3cd56f64e066c70f8aa1b5bd (diff)
Fix for EXT-2667 - making sure inv_item isn't null
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index a6a5ecb8e7..86f691dda2 100644
--- 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())