merge changes for 3.7.12-release

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

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

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

...iew/skins/default/xui/en/floater_region_debug_console.xml

.../newview/skins/default/xui/en/floater_script_ed_prefs.xml

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

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

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

...wview/skins/default/xui/en/panel_preferences_advanced.xml

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

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

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

indra/test/llsdmessagebuilder_tut.cpp

indra/test/lltemplatemessagebuilder_tut.cpp