Merge from default branch

indra/newview/llappearancemgr.cpp

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llfolderviewitem.cpp

indra/newview/llfolderviewitem.h

indra/newview/llinventoryicon.cpp

indra/newview/llinventorypanel.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanelmaininventory.cpp

indra/newview/llpanelobjectinventory.cpp

indra/newview/llpaneloutfitsinventory.cpp

indra/newview/llsidepanelinventory.cpp

indra/newview/lltexlayerparams.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llviewerinventory.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewervisualparam.cpp

indra/newview/llvoavatardefines.h

indra/newview/llvoavatarself.cpp

indra/newview/llvovolume.cpp