diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
| commit | 44d0fd81ee3d26a80068713182ac19885ea40f95 (patch) | |
| tree | 96577339efce5ccb30dc3968ebb3ee2bd9ea4155 /indra/newview/llavataractions.cpp | |
| parent | d6726e6e4b40efaee35b8df5ac9d1098f208bcac (diff) | |
| parent | fe91462d6277251dbcc6053bc8ecd54dd93a13f0 (diff) | |
(hairy) merge from 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 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(); |