diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
| commit | 854e6acb424faa843f9bff7875927fcfec2cb1d4 (patch) | |
| tree | 5a5f21c59ba6eb1c6551bb37538f3125c2c4ccbb /indra/newview/llavataractions.cpp | |
| parent | 547bcc907389aeb1a3d974025b621e98d1178714 (diff) | |
| parent | afaa076b7dd300a2836205fe6eb9ba5ab08bfb28 (diff) | |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -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 a6e1691ffa..2a1f239065 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -543,9 +543,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(); |