merge changes for vmrg-212

doc/contributions.txt

indra/llcommon/llerror.cpp

indra/llcommon/llerrorcontrol.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/newview/llfilepicker.cpp

indra/newview/llfilepicker.h

indra/newview/llfloaternamedesc.cpp

indra/newview/llfloaternamedesc.h

indra/newview/llpanelgrouplandmoney.cpp

indra/newview/llpreviewscript.cpp

indra/newview/llpreviewscript.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermenu.cpp

indra/newview/llvoavatar.cpp

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

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

...ewview/skins/default/xui/en/panel_preferences_general.xml

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

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