summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-02-02 10:57:09 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-02-02 10:57:09 -0500
commitb9376ab990707aafb041ef630d321b886bed6128 (patch)
tree75cb218be1507c60d79ed543a13ca6bcae1d6e54 /indra/newview/llavataractions.cpp
parentb0d94fa706efd7794b4ba5b9160ddcfc33233ca4 (diff)
parent0e609cc95b08c28bd51f5ab48160fd93df7a6b28 (diff)
merge
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rwxr-xr-xindra/newview/llavataractions.cpp2
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();
}
}