merge changes for vmrg-230

doc/contributions.txt

indra/newview/app_settings/commands.xml

indra/newview/llagent.cpp

indra/newview/llfloaterscriptdebug.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llnetmap.cpp

indra/newview/llpreviewanim.cpp

indra/newview/llpreviewanim.h

indra/newview/lltexturectrl.cpp

indra/newview/lltoolmgr.cpp

indra/newview/lltoolmgr.h

indra/newview/llworld.cpp

indra/newview/llworldmapview.cpp

indra/newview/llworldmapview.h

.../newview/skins/default/textures/map_avatar_unknown_32.tga

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

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