merge

indra/llcommon/llfasttimer_class.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llchatbar.cpp

indra/newview/llface.cpp

indra/newview/llfloaterhardwaresettings.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llnearbychatbar.cpp

indra/newview/llstartup.cpp

indra/newview/llstartup.h

indra/newview/lltoolbar.cpp

indra/newview/lltoolgrab.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llviewerwindow.h