summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:01:46 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:01:46 +0000
commit284cab7f0fef170b1bdd39c975fb236784c536aa (patch)
treee88c0afc916dda1933ad68bfdab41fc479737cc1 /indra/newview
parentd928ed69a9083c16535aba848e29aaa87d9b1119 (diff)
CID-82
Checker: FORWARD_NULL Function: LLFolderBridge::pasteFromClipboard() File: /indra/newview/llinventorybridge.cpp
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorybridge.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 5d2a1b7a41..9cfd5fc3ab 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2429,7 +2429,9 @@ void LLFolderBridge::pasteFromClipboard()
{
// move_inventory_item() is not enough,
//we have to update inventory locally too
- changeItemParent(model, dynamic_cast<LLViewerInventoryItem*>(item), parent_id, FALSE);
+ LLViewerInventoryItem* viitem = dynamic_cast<LLViewerInventoryItem*>(item);
+ llassert(viitem);
+ changeItemParent(model, viitem, parent_id, FALSE);
}
else
{