Commits

Scott Lawrence committed 3c313a7

fix merge conflict in remove_item

Comments (0)

Files changed (1)

indra/newview/llinventoryfunctions.cpp

 		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);
 		}
 	}
 }