Automated merge with ssh://hg.lindenlab.com/brad/viewer-dev

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llui/llaccordionctrltab.cpp

indra/llui/llaccordionctrltab.h

indra/llui/llnotifications.cpp

indra/llui/llnotifications.h

indra/newview/app_settings/CA.pem

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_solaris.txt

indra/newview/gpu_table.txt

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llappviewer.cpp

indra/newview/llchannelmanager.h

indra/newview/llfloaterworldmap.cpp

indra/newview/llfloaterworldmap.h

indra/newview/llimview.cpp