diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
| commit | a07a8cbf6eca73272f2c774df7122a1f0c5e1aa9 (patch) | |
| tree | f716bdae5a265aabf8f9da1413df6a19fe3ada52 /indra/newview/llavataractions.cpp | |
| parent | c938e165062cbe53065dcdaa434fc1c3d9f38774 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
merge changes for 4.0.4-release
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rwxr-xr-x | indra/newview/llavataractions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 8dc8a2ff20..00bc8ebe87 100755 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -564,7 +564,8 @@ namespace action_give_inventory static LLInventoryPanel* get_active_inventory_panel() { LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE); - if (!active_panel) + LLFloater* floater_appearance = LLFloaterReg::findInstance("appearance"); + if (!active_panel || (floater_appearance && floater_appearance->hasFocus())) { active_panel = get_outfit_editor_inventory_panel(); } |