diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 11:07:11 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 11:07:11 -0800 |
| commit | dc0573be6cff912a20a2eab2ebd6ce61dc687ba6 (patch) | |
| tree | d6a8012cd845931d994d587cd3f34e1b988175fb /indra/newview/llavataractions.cpp | |
| parent | 1f9529c0c2b02c4ceee912f8ecb35181174cc7cc (diff) | |
| parent | 577479a3e53ef152da191e3a004aeb34f0815658 (diff) | |
Merge with viewer-dd, attempt #1
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 7abecc643b..9a7cdcfa21 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -724,7 +724,7 @@ std::set<LLUUID> LLAvatarActions::getInventorySelectedUUIDs() LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel<LLSidepanelInventory>("inventory"); if (sidepanel_inventory) { - inventory_selected_uuids = sidepanel_inventory->getInboxOrOutboxSelectionList(); + inventory_selected_uuids = sidepanel_inventory->getInboxSelectionList(); } } |