automated merge viewer2.0->viewer2.0

indra/llui/lllineeditor.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llcallfloater.cpp

indra/newview/llimfloater.cpp

indra/newview/llimview.cpp

indra/newview/lllocationinputctrl.cpp

indra/newview/lllocationinputctrl.h

indra/newview/llpanellogin.cpp

indra/newview/llstartup.cpp

indra/newview/skins/default/xui/en/floater_outgoing_call.xml

indra/newview/skins/default/xui/en/panel_navigation_bar.xml

indra/newview/skins/default/xui/en/strings.xml

...a/newview/skins/default/xui/en/widgets/location_input.xml