automated merge viewer2.0->viewer2.0

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llchathistory.cpp

indra/newview/llfloatergesture.cpp

indra/newview/llgesturemgr.cpp

indra/newview/llgesturemgr.h

indra/newview/llinspecttoast.cpp

indra/newview/llinspecttoast.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychatbar.cpp

indra/newview/llnearbychatbar.h

indra/newview/llnearbychathandler.cpp

indra/newview/lloutputmonitorctrl.cpp

indra/newview/lloutputmonitorctrl.h

indra/newview/llpanelimcontrolpanel.cpp

indra/newview/llpanelpick.cpp

indra/newview/llpanelpick.h