From f97e196d0698716fe215dfa1719519055de2cacc Mon Sep 17 00:00:00 2001 From: Sergei Litovchuk Date: Wed, 21 Jul 2010 00:06:43 +0300 Subject: EXT-8245 FIXED Added passing inventory panel to give_inventory_cb callback when called from 'Add More' panel. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/737/. --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 752a2e7504..1e59e5b805 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -550,9 +550,10 @@ namespace action_give_inventory } LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); - if (NULL == active_panel) + if (!active_panel) { - return; + active_panel = get_outfit_editor_inventory_panel(); + if (!active_panel) return; } const uuid_set_t inventory_selected_uuids = active_panel->getRootFolder()->getSelectionList(); -- cgit v1.2.3