From a56424d0781a07bbf74b9c6cdde5a488a3ba8329 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 13 Apr 2012 20:57:52 -0400 Subject: fix merge conflict in remove_item --- indra/newview/llinventoryfunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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); } } } -- cgit v1.2.3