Conflicts: indra/newview/llpanelmaininventory.cpp indra/newview/llpanelmaininventory.h indra/newview/llvoavatar.cpp