diff options
author | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-03-30 13:31:26 -0400 |
commit | e56ea836383bd357809f86e2ffebafee8f481222 (patch) | |
tree | 8b5dd20b28261fba8b33953ef0f522914b2252c0 /indra/newview/llavataractions.cpp | |
parent | 6f71df192720ec3f16e7e7102ad21f4d140b8e07 (diff) | |
parent | e60dac5ce486f55fe69949a6a3a2949d4f868193 (diff) |
merge changes for latest core and updates from Kitty
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(); } } |