Merged in SL-717 Additional search options for inventory window

indra/llui/llfolderviewmodel.h

indra/newview/llconversationmodel.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventoryfilter.cpp

indra/newview/llinventoryfilter.h

indra/newview/llinventorypanel.cpp

indra/newview/llinventorypanel.h

indra/newview/llpanelmaininventory.cpp

indra/newview/llpanelmaininventory.h

indra/newview/llpanelobjectinventory.cpp

indra/newview/llsidepanelinventory.cpp

indra/newview/llsidepanelinventory.h

...ew/skins/default/xui/en/floater_inventory_view_finder.xml

indra/newview/skins/default/xui/en/menu_inventory.xml

indra/newview/skins/default/xui/en/panel_main_inventory.xml