automated merge viewer2.0->viewer2.0

indra/llmessage/llregionflags.h

indra/llplugin/llpluginsharedmemory.cpp

indra/llplugin/llpluginsharedmemory.h

indra/llui/llhelp.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/llappviewer.cpp

indra/newview/llavatarpropertiesprocessor.cpp

indra/newview/llcommanddispatcherlistener.cpp

indra/newview/llcommanddispatcherlistener.h

indra/newview/llcommandhandler.cpp

indra/newview/llfloaterland.cpp

indra/newview/llfloaterparcel.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfloaterregioninfo.h

indra/newview/llfloaterreporter.cpp

indra/newview/llfloaterreporter.h

indra/newview/llfloatertools.cpp

indra/newview/llfloatervoicedevicesettings.cpp