fix merge conflict in remove_item

2012-04-13 20:57:52 -04:00 · 2012-04-13 20:57:52 -04:00 · a56424d078
parent f79b775fcc
commit a56424d078
1 changed files with 1 additions and 1 deletions
--- 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);
 		}
 	}
 }