diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
| commit | e1c5abce9309a89bd9993264bca8dadadf882c6f (patch) | |
| tree | 81e1f91811b207abd4dfe4c82db31583d92df212 /indra/newview/llselectmgr.cpp | |
| parent | 33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff) | |
| parent | 0bd2567bf5648808a95c7826581199bb371597cb (diff) | |
merge with remote repo
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", |