summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewnotecard.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-04 15:28:08 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-04 15:28:08 -0400
commit6ee04562208100fc164bd3818ab3ba73f060d90c (patch)
tree27b544b1832a9f3d88b39bc66a5e676d5aba511b /indra/newview/llpreviewnotecard.cpp
parent8dae8290b7be728d0c70205b1f27b08f899c9d32 (diff)
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
merge
Diffstat (limited to 'indra/newview/llpreviewnotecard.cpp')
-rw-r--r--indra/newview/llpreviewnotecard.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 4974dde282..3a9360fd23 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -29,7 +29,6 @@
#include "llpreviewnotecard.h"
#include "llinventory.h"
-#include "llinventoryfunctions.h" // for change_item_parent()
#include "llagent.h"
#include "llassetuploadresponders.h"
@@ -494,7 +493,7 @@ void LLPreviewNotecard::deleteNotecard()
if (item != NULL)
{
const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
- change_item_parent(&gInventory, item, trash_id, FALSE);
+ gInventory.changeItemParent(item, trash_id, FALSE);
}
closeFloater();