diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
| commit | cb957d3dabfd0a419cb70461cc5bf3af2adba7a3 (patch) | |
| tree | ac9978539aa02d80bf8c026aa3b2e1ba85404ecf /indra/newview/llavataractions.cpp | |
| parent | 7819b49086729187e198bf69f9c45f1c63f11ff2 (diff) | |
| parent | b8320207bb911a311a498426fdd4a987dd7748ea (diff) | |
merge late 3.0.1 beta candidate fixes
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; |