Merged in lindenlab/viewer-lynx

doc/contributions.txt

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/newview/CMakeLists.txt

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/llaisapi.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llavatarrendernotifier.cpp

indra/newview/llfeaturemanager.cpp

indra/newview/llfeaturemanager.h

indra/newview/llfloaterdeleteprefpreset.cpp

indra/newview/llpresetsmanager.cpp

indra/newview/llpresetsmanager.h

indra/newview/llvoavatar.cpp

indra/newview/viewer_manifest.py