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

Wed, 02 Mar 2016 16:58:50 +0200

author
Mnikolenko ProductEngine <mnikolenko@productengine.com>
date
Wed, 02 Mar 2016 16:58:50 +0200
changeset 48908
7d463d571eeb
parent 48907
595689131143
child 48909
16f91253ce49

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

indra/newview/llavataractions.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llavataractions.cpp	Mon Feb 29 19:23:47 2016 +0200
     1.2 +++ b/indra/newview/llavataractions.cpp	Wed Mar 02 16:58:50 2016 +0200
     1.3 @@ -564,7 +564,8 @@
     1.4  	static LLInventoryPanel* get_active_inventory_panel()
     1.5  	{
     1.6  		LLInventoryPanel* active_panel = LLInventoryPanel::getActiveInventoryPanel(FALSE);
     1.7 -		if (!active_panel)
     1.8 +		LLFloater* floater_appearance = LLFloaterReg::findInstance("appearance");
     1.9 +		if (!active_panel || (floater_appearance && floater_appearance->hasFocus()))
    1.10  		{
    1.11  			active_panel = get_outfit_editor_inventory_panel();
    1.12  		}

mercurial