diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-25 12:01:05 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-25 12:01:05 -0500 |
| commit | 57bc7dc44f31ef132a4abec228459c490c425eed (patch) | |
| tree | 70178face4242ee8801c5e759c608bf1c9695eff /indra/newview/llinventorybridge.cpp | |
| parent | 33450e6f1fc95e3552d2115bf7e4fcf05f3d7916 (diff) | |
| parent | 725cdc6e5b85da369386d586c50ceb453c5979b4 (diff) | |
automated merge from viewer-2-0 pull -u
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 9421cf5716..aa71904595 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2849,7 +2849,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())
|