diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-03-02 16:58:50 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2016-03-02 16:58:50 +0200 |
| commit | 1d72c0ec6a166080e3bee28330f53fe734a372a9 (patch) | |
| tree | a33a23f099efedbe64aa49a42e4215ef5121f386 /indra/newview | |
| parent | 6a37e654ef5c79b59c66f69f97ca99254b956145 (diff) | |
MAINT-5362 Adding/detaching/taking off etc from the inventory view in appearance panel will add/remove the wrong item if a different item is selected in inventory floater
Diffstat (limited to 'indra/newview')
| -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(); } |