automated merge viewer2.0->viewer2.0

indra/llui/llsearcheditor.cpp

indra/llui/llsearcheditor.h

indra/llwindow/llwindowmacosx.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llgesturemgr.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventoryfilter.cpp

indra/newview/llinventoryfilter.h

indra/newview/llinventoryfunctions.h

indra/newview/llinventorymodel.cpp

indra/newview/llinventorymodel.h

indra/newview/llinventorypanel.cpp

indra/newview/llinventorypanel.h

indra/newview/llpanelmaininventory.cpp

indra/newview/llpanelobjectinventory.cpp

indra/newview/llpaneloutfitsinventory.cpp

indra/newview/llsidepanelinventory.cpp