diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-13 20:57:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-13 20:57:52 -0400 |
| commit | a56424d0781a07bbf74b9c6cdde5a488a3ba8329 (patch) | |
| tree | 0ba22dc3ee172365badc0f68397cac4b603077c8 /indra/newview/llinventoryfunctions.cpp | |
| parent | f79b775fcc94b1bad6869a6977a5049f356630cc (diff) | |
fix merge conflict in remove_item
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 629fa53388..94d1b19726 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -128,7 +128,7 @@ void remove_item(LLInventoryModel* model, const LLUUID& id) if (trash_id.notNull()) { // Finally, move the item to the trash - change_item_parent(model, item, trash_id, true); + model->changeItemParent(item, trash_id, true); } } } |