diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-07-30 10:11:55 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-07-30 10:11:55 -0400 |
| commit | 19c0d6d4eaf21cbfc96d7057c11db35edf73f2fe (patch) | |
| tree | 21984bc2d7a41ba2587a424499f97d3e6d527da4 /indra/newview/llavataractions.cpp | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
| parent | 7a4174447a0762dcab2769d1401295b78c9341fd (diff) | |
Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1
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 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(); |