diff options
| author | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-08-11 10:11:59 -0700 |
| commit | b215c724c1394e7c27a0309341ffc3b4f2154b25 (patch) | |
| tree | c9a5eba93a0d333285bc2e87e15ed40e546f7d28 /indra/newview/llavataractions.cpp | |
| parent | c7b6a25728cd360348d1c3da5ace0971767206a4 (diff) | |
| parent | 9a9e78740ada6a64847d1e915ae8e92258e8f10a (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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; |