diff options
| author | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
| commit | 95738da3d82b92e82744dbc6b377a3feae2e6441 (patch) | |
| tree | cf1678c617ea644a14d20a40fbfc58f156fd9591 /indra/newview/llselectmgr.cpp | |
| parent | 35c7c7a9b29ef4462ea969b393c25b59813ef169 (diff) | |
| parent | af401ac6dc463db477210b0ff100014fbeb50a9a (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 b8ceef0899..26e668adb5 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", |