diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:44:47 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:44:47 -0700 |
commit | f83fcc357ff23418b0692bdaf3ae998f870685a0 (patch) | |
tree | 731cd8ac153fcd4ed3ef7e5e8d63cc2c60b46117 /indra/newview/llfolderview.cpp | |
parent | 05921cfcb2db7ccc8fb872d942eb236b839e3dad (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/llfolderview.cpp')
-rw-r--r-- | indra/newview/llfolderview.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index bad0d8cd8f..1fa194ab19 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1059,19 +1059,7 @@ void LLFolderView::removeCutItems() iter != objects.end(); ++iter) { - const LLUUID& item_id = (*iter); - LLInventoryObject *obj = gInventory.getObject(item_id); - if (obj) - { - if (LLAssetType::AT_CATEGORY == obj->getType()) - { - remove_category(&gInventory, item_id); - } - else - { - remove_item(&gInventory, item_id); - } - } + gInventory.removeObject(*iter); } } |