diff options
| author | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-07-21 00:06:43 +0300 |
|---|---|---|
| committer | Sergei Litovchuk <slitovchuk@productengine.com> | 2010-07-21 00:06:43 +0300 |
| commit | f97e196d0698716fe215dfa1719519055de2cacc (patch) | |
| tree | 50df55656818ba0c34794ed3d2c50041326d6fab /indra | |
| parent | 4d40d670a119d753ff59076d80bd5d2bf2c02c80 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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(); |