diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:07:14 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:07:14 -0800 |
commit | 16202f5e00c6e95f6df56ed8924c2fcb13b4ef17 (patch) | |
tree | f9579b40277f21f07a325ae9d59dd230c203bef1 /indra/newview/llselectmgr.cpp | |
parent | 6ec038c0cad54f36d89678df63ae7526f5fb5bca (diff) | |
parent | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (diff) |
merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 759c86f3a0..abfb51b6e1 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2827,7 +2827,7 @@ bool LLSelectMgr::confirmDelete(const LLSD& notification, const LLSD& response, case 0: { // TODO: Make sure you have delete permissions on all of them. - LLUUID trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH); + const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); // attempt to derez into the trash. LLDeRezInfo* info = new LLDeRezInfo(DRD_TRASH, trash_id); LLSelectMgr::getInstance()->sendListToRegions("DeRezObject", |