diff options
author | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-04-17 13:47:31 -0700 |
commit | 19e0cc93a8af661dbac47552474a704ade600c74 (patch) | |
tree | 5d7e539a4c98607a189c6e472732b75608379abb /indra/newview/llpreviewnotecard.cpp | |
parent | ee1124e1c02b1a8be0cc8d2cbce1083dca3b40a2 (diff) | |
parent | 3ccda1f2855ae9e5b3f519236e9b4f233d542d1a (diff) |
DRTVWR-139: merge back 3.3.1-beta2 fixes
Diffstat (limited to 'indra/newview/llpreviewnotecard.cpp')
-rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 3 |
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(); |