diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-18 17:25:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-18 17:25:48 -0400 |
| commit | 0325d9060e40bb02794c1cf720188d73db5ca8a6 (patch) | |
| tree | 4a8e44dbee085cb5157f2befe19e7157177743a2 /indra/newview/llavataractions.cpp | |
| parent | e0bf0e3e2150304e7b26c18c274273c18653965b (diff) | |
| parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (diff) | |
merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index f22b02093f..4cdfcea64e 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -697,12 +697,8 @@ std::set<LLUUID> LLAvatarActions::getInventorySelectedUUIDs() if (inventory_selected_uuids.empty()) { LLSidepanelInventory * sidepanel_inventory = LLSideTray::getInstance()->getPanel<LLSidepanelInventory>("sidepanel_inventory"); - LLInventoryPanel * inbox = sidepanel_inventory->findChild<LLInventoryPanel>("inventory_inbox"); - if (inbox) - { - inventory_selected_uuids = inbox->getRootFolder()->getSelectionList(); - } + inventory_selected_uuids = sidepanel_inventory->getInboxOrOutboxSelectionList(); } return inventory_selected_uuids; |