Merge from default branch

indra/llimage/llimagedimensionsinfo.h

indra/llmessage/llassetstorage.cpp

indra/newview/app_settings/settings.xml

indra/newview/llinventoryobserver.cpp

indra/newview/llinventoryobserver.h

indra/newview/llviewermessage.cpp

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

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

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

indra/newview/skins/default/xui/es/panel_region_general.xml

indra/newview/skins/default/xui/fr/floater_color_picker.xml

indra/newview/skins/default/xui/fr/floater_customize.xml

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

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

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

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